diff --git a/frappe/core/doctype/user/test_user.py b/frappe/core/doctype/user/test_user.py
index d6f51f4c67d..281a9f775d0 100644
--- a/frappe/core/doctype/user/test_user.py
+++ b/frappe/core/doctype/user/test_user.py
@@ -288,7 +288,7 @@ def test_rate_limiting_for_reset_password(self):
 		c = FrappeClient(url)
 		res1 = c.session.post(url, data=data, verify=c.verify, headers=c.headers)
 		res2 = c.session.post(url, data=data, verify=c.verify, headers=c.headers)
-		self.assertEqual(res1.status_code, 400)
+		self.assertEqual(res1.status_code, 404)
 		self.assertEqual(res2.status_code, 417)
 
 	def test_user_rename(self):
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 3dc43ccc33e..1568ae8af33 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -891,7 +891,7 @@ def reset_password(user):
 			title=_("Password Email Sent"),
 		)
 	except frappe.DoesNotExistError:
-		frappe.local.response["http_status_code"] = 400
+		frappe.local.response["http_status_code"] = 404
 		frappe.clear_messages()
 		return "not found"
 
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index 60dd0396de0..defbbc2975f 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -253,7 +253,8 @@ login.login_handlers = (function () {
 			}
 		},
 		401: get_error_handler('{{ _("Invalid Login. Try again.") }}'),
-		417: get_error_handler('{{ _("Oops! Something went wrong") }}')
+		417: get_error_handler('{{ _("Oops! Something went wrong") }}'),
+		404: get_error_handler('{{ _("User does not exist.")}}')
 	};
 
 	return login_handlers;