diff --git a/frappe/config/setup.py b/frappe/config/setup.py
index c1604e90f9..cd2f58fcc4 100644
--- a/frappe/config/setup.py
+++ b/frappe/config/setup.py
@@ -31,13 +31,6 @@ def get_data():
 					"icon": "fa fa-lock",
 					"description": _("Set Permissions on Document Types and Roles")
 				},
-				{
-					"type": "page",
-					"name": "user-permissions",
-					"label": _("User Permissions Manager"),
-					"icon": "fa fa-shield",
-					"description": _("Set Permissions per User")
-				},
 				{
 					"type": "page",
 					"name": "modules_setup",
diff --git a/frappe/patches/v8_x/update_user_permission.py b/frappe/patches/v8_x/update_user_permission.py
index 9ba071c126..0f8045f48d 100644
--- a/frappe/patches/v8_x/update_user_permission.py
+++ b/frappe/patches/v8_x/update_user_permission.py
@@ -15,7 +15,7 @@ def execute():
 		and
 			parenttype='User Permission'
 		""", as_dict=True):
-		if frappe.db.exists(perm.defkey, perm.defvalue):
+		if frappe.db.exists(perm.defkey, perm.defvalue) and frappe.db.exists('User', perm.parent):
 			frappe.get_doc(dict(
 				doctype='User Permission',
 				user=perm.parent,