diff --git a/erpnext/hub_node/api.py b/erpnext/hub_node/api.py
index 0f1b0a1..be81eff 100644
--- a/erpnext/hub_node/api.py
+++ b/erpnext/hub_node/api.py
@@ -1,7 +1,9 @@
 from __future__ import unicode_literals
 import frappe, json
+import io, base64, os, requests
 from frappe.frappeclient import FrappeClient
 from frappe.desk.form.load import get_attachments
+from frappe.utils.file_manager import get_file_path
 from six import string_types
 
 @frappe.whitelist()
@@ -119,9 +121,6 @@
 
 
 def load_base64_image_from_items(items):
-	import io, base64, urllib, os, requests, tempfile
-	from frappe.utils.file_manager import get_file_path
-
 	for item in items:
 		file_path = item['image']
 		file_name = os.path.basename(file_path)
diff --git a/erpnext/hub_node/doctype/hub_settings/hub_settings.py b/erpnext/hub_node/doctype/hub_settings/hub_settings.py
index 7478db9..ab0a7d2 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 @@
 	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 = {