diff --git a/frappe/auth.py b/frappe/auth.py
index 6d51629c58..3b18c8adb9 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -164,16 +164,10 @@ class LoginManager:
 		self.full_name = " ".join(filter(None, [self.info.first_name,
 			self.info.last_name]))
 
-		if self.info.user_type=="Website User":
-			frappe.local.cookie_manager.set_cookie("system_user", "no")
-			if not resume:
-				frappe.local.response["message"] = "No App"
-				frappe.local.response["home_page"] = '/' + get_home_page()
-		else:
-			frappe.local.cookie_manager.set_cookie("system_user", "yes")
-			if not resume:
-				frappe.local.response['message'] = 'Logged In'
-				frappe.local.response["home_page"] = "/desk"
+		frappe.local.cookie_manager.set_cookie("system_user", "yes")
+		if not resume:
+			frappe.local.response['message'] = 'Logged In'
+			frappe.local.response["home_page"] = "/desk"
 
 		if not resume:
 			frappe.response["full_name"] = self.full_name
diff --git a/frappe/boot.py b/frappe/boot.py
index 6293b5b6f5..bb1cff40f9 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -226,7 +226,7 @@ def load_translations(bootinfo):
 def get_user_info():
 	user_info = frappe.db.get_all('User', fields=['`name`', 'full_name as fullname', 'user_image as image',
 		'gender', 'email', 'username', 'bio', 'location', 'interest', 'banner_image', 'allowed_in_mentions'],
-		filters=dict(enabled=1, user_type=['!=', 'Website User']))
+		filters=dict(enabled=1))
 
 	user_info_map = {d.name: d for d in user_info}
 
@@ -320,6 +320,6 @@ def get_desk_settings():
 
 	for role in role_list:
 		for key in desk_properties:
-			desk_settings[key] = desk_settings[key] or role[key]
+			desk_settings[key] = desk_settings.get(key) or role.get(key)
 
 	return desk_settings
\ No newline at end of file
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 16f4986c35..9fc6658f29 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -182,20 +182,17 @@ class User(Document):
 
 
 	def share_with_self(self):
-		if self.user_type=="System User":
-			frappe.share.add(self.doctype, self.name, self.name, write=1, share=1,
-				flags={"ignore_share_permission": True})
-		else:
-			frappe.share.remove(self.doctype, self.name, self.name,
-				flags={"ignore_share_permission": True, "ignore_permissions": True})
+		frappe.share.add(self.doctype, self.name, self.name, write=1, share=1,
+			flags={"ignore_share_permission": True})
 
 	def validate_share(self, docshare):
-		if docshare.user == self.name:
-			if self.user_type=="System User":
-				if docshare.share != 1:
-					frappe.throw(_("Sorry! User should have complete access to their own record."))
-			else:
-				frappe.throw(_("Sorry! Sharing with Website User is prohibited."))
+		pass
+		# if docshare.user == self.name:
+		# 	if self.user_type=="System User":
+		# 		if docshare.share != 1:
+		# 			frappe.throw(_("Sorry! User should have complete access to their own record."))
+		# 	else:
+		# 		frappe.throw(_("Sorry! Sharing with Website User is prohibited."))
 
 	def send_password_notification(self, new_password):
 		try:
diff --git a/frappe/www/desk.py b/frappe/www/desk.py
index b3974df852..764235f583 100644
--- a/frappe/www/desk.py
+++ b/frappe/www/desk.py
@@ -14,8 +14,8 @@ import frappe.sessions
 def get_context(context):
 	if frappe.session.user == "Guest":
 		frappe.throw(_("Log in to access this page."), frappe.PermissionError)
-	elif frappe.db.get_value("User", frappe.session.user, "user_type") == "Website User":
-		frappe.throw(_("You are not permitted to access this page."), frappe.PermissionError)
+	# elif frappe.db.get_value("User", frappe.session.user, "user_type") == "Website User":
+	# 	frappe.throw(_("You are not permitted to access this page."), frappe.PermissionError)
 
 	hooks = frappe.get_hooks()
 	try: