diff --git a/erpnext/hub_node/doctype/hub_settings/hub_settings.py b/erpnext/hub_node/doctype/hub_settings/hub_settings.py
index 7478db97a8..ab0a7d24ff 100644
--- a/erpnext/hub_node/doctype/hub_settings/hub_settings.py
+++ b/erpnext/hub_node/doctype/hub_settings/hub_settings.py
@@ -23,10 +23,12 @@ class HubSettings(Document):
 	def register(self):
 		""" Create a User on hub.erpnext.org and return username/password """
 
+		if frappe.session.user == 'Administrator':
+			frappe.throw(_('Please login as another user to register on Marketplace'))
+
 		if 'System Manager' not in frappe.get_roles():
 			frappe.throw(_('Only users with System Manager role can register on Marketplace'), frappe.PermissionError)
 
-		# TODO: site_name for cloud sites
 		self.site_name = frappe.utils.get_url()
 
 		data = {