diff --git a/frappe/auth.py b/frappe/auth.py
index 667278842d..afae3af0e4 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -184,7 +184,7 @@ class LoginManager:
 			frappe.local.cookie_manager.set_cookie("system_user", "yes")
 			if not resume:
 				frappe.local.response["message"] = "Logged In"
-				frappe.local.response["home_page"] = get_default_path()
+				frappe.local.response["home_page"] = get_default_path() or "/app"
 
 		if not resume:
 			frappe.response["full_name"] = self.full_name
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 0062661cce..4b220814d7 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -867,7 +867,7 @@ def update_password(
 	frappe.db.set_value("User", user, "reset_password_key", "")
 
 	if user_doc.user_type == "System User":
-		return get_default_path()
+		return get_default_path() or "/app"
 	else:
 		return redirect_url or get_default_path() or get_home_page()
 
diff --git a/frappe/www/login.py b/frappe/www/login.py
index ac0e60427c..4806989f3c 100644
--- a/frappe/www/login.py
+++ b/frappe/www/login.py
@@ -27,9 +27,10 @@ def get_context(context):
 
 	if frappe.session.user != "Guest":
 		if not redirect_to:
-			redirect_to = get_default_path()
-			if frappe.session.data.user_type == "Website User" and not redirect_to:
-				redirect_to = get_home_page()
+			if frappe.session.data.user_type == "Website User":
+				redirect_to = get_default_path() or get_home_page()
+			else:
+				redirect_to = get_default_path() or "/app"
 
 		if redirect_to != "login":
 			frappe.local.flags.redirect_location = redirect_to