diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py
index 55df633316..6467bf1ff1 100644
--- a/frappe/website/doctype/website_settings/website_settings.py
+++ b/frappe/website/doctype/website_settings/website_settings.py
@@ -179,7 +179,7 @@ def get_website_settings(context=None):
 			"footer_items": modify_header_footer_items(settings.footer_items),
 			"post_login": [
 				{"label": _("My Account"), "url": "/me"},
-				{"label": _("Log out"), "url": "/?cmd=web_logout"},
+				{"label": _("Log out"), "url": "/logout"},
 			],
 		}
 	)
diff --git a/frappe/www/portal.py b/frappe/www/portal.py
index f544369c37..cfe383dbae 100644
--- a/frappe/www/portal.py
+++ b/frappe/www/portal.py
@@ -8,6 +8,8 @@ from frappe.www.list import get_list_context, get_list_data
 
 
 def get_context(context, **dict_params):
+	if frappe.session.user == "Guest":
+		raise frappe.PermissionError
 	frappe.local.form_dict.update(dict_params)
 	context.show_sidebar = True
 	doctype = frappe.local.form_dict.doctype
@@ -15,8 +17,8 @@ def get_context(context, **dict_params):
 		context.meta = frappe.get_meta(doctype)
 		context.update(get_list_context(context, doctype) or {})
 		context.update(get(**frappe.local.form_dict))
-	context.home_page = "/portal"
-	context.doctype = frappe.local.form_dict.doctype
+		context.home_page = "/portal"
+		context.doctype = frappe.local.form_dict.doctype
 	return context