diff --git a/src/Umbraco.Web.UI.Login/src/auth.element.ts b/src/Umbraco.Web.UI.Login/src/auth.element.ts
index a3ba757cb025..728ab19b05fa 100644
--- a/src/Umbraco.Web.UI.Login/src/auth.element.ts
+++ b/src/Umbraco.Web.UI.Login/src/auth.element.ts
@@ -112,6 +112,7 @@ const createFormLayoutItem = (label: HTMLLabelElement, input: HTMLInputElement,
 	// Bind validation
 	input.oninput = () => validateInput(input, validationMessage, localizationKey);
 	input.onblur = () => validateInput(input, validationMessage, localizationKey);
+	input.oninvalid = () => validateInput(input, validationMessage, localizationKey);
 
 	return formLayoutItem;
 };
@@ -139,6 +140,7 @@ const createFormLayoutPasswordItem = (
 	// Bind validation
 	input.oninput = () => validateInput(input, validationMessage, requiredMessageKey);
 	input.onblur = () => validateInput(input, validationMessage, requiredMessageKey);
+	input.oninvalid = () => validateInput(input, validationMessage, requiredMessageKey);
 
 	return formLayoutItem;
 };