diff --git a/src/common-components/AuthnValidationFormGroup.jsx b/src/common-components/AuthnValidationFormGroup.jsx
index 97f9c4ae..9f2feb33 100644
--- a/src/common-components/AuthnValidationFormGroup.jsx
+++ b/src/common-components/AuthnValidationFormGroup.jsx
@@ -63,6 +63,7 @@ const AuthnCustomValidationFormGroup = (props) => {
     value: props.value,
     className: props.inputFieldStyle,
     'aria-invalid': props.ariaInvalid,
+    autoComplete: 'on',
   };
   inputProps.onChange = (e) => onChangeHandler(e, onChange);
   inputProps.onClick = (e) => onClickHandler(e, onClick);
diff --git a/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap b/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap
index 05844318..95bc2a2f 100644
--- a/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap
+++ b/src/forgot-password/tests/__snapshots__/ForgotPasswordPage.test.jsx.snap
@@ -32,6 +32,7 @@ exports[`ForgotPasswordPage should match default section snapshot 1`] = `
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="forgot-password-input"
           name="email"
@@ -154,6 +155,7 @@ exports[`ForgotPasswordPage should match forbidden section snapshot 1`] = `
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="forgot-password-input"
           name="email"
@@ -261,6 +263,7 @@ exports[`ForgotPasswordPage should match pending section snapshot 1`] = `
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="forgot-password-input"
           name="email"
diff --git a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
index cd86e364..01680d3c 100644
--- a/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
+++ b/src/login/tests/__snapshots__/LoginPage.test.jsx.snap
@@ -45,6 +45,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="email"
             name="email"
@@ -70,6 +71,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="password"
             name="password"
@@ -241,6 +243,7 @@ exports[`LoginPage should match default section snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="email"
             name="email"
@@ -266,6 +269,7 @@ exports[`LoginPage should match default section snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="password"
             name="password"
@@ -435,6 +439,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="email"
             name="email"
@@ -460,6 +465,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="password"
             name="password"
@@ -589,6 +595,7 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="email"
             name="email"
@@ -614,6 +621,7 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="password"
             name="password"
@@ -780,6 +788,7 @@ exports[`LoginPage should show error message 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="email"
             name="email"
@@ -805,6 +814,7 @@ exports[`LoginPage should show error message 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="password"
             name="password"
diff --git a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
index e76dcf04..4ca4ede9 100644
--- a/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
+++ b/src/register/tests/__snapshots__/RegistrationPage.test.jsx.snap
@@ -44,6 +44,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="name"
             name="name"
@@ -69,6 +70,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="username"
             name="username"
@@ -94,6 +96,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="email"
             name="email"
@@ -119,6 +122,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="password"
             name="password"
@@ -144,6 +148,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           <select
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control text-muted border-gray-600"
             id="country"
             name="country"
@@ -1474,6 +1479,7 @@ exports[`RegistrationPageTests should match TPA provider snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             checked={false}
             className="form-check-input"
             id="optional"
@@ -1607,6 +1613,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="name"
             name="name"
@@ -1632,6 +1639,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="username"
             name="username"
@@ -1657,6 +1665,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="email"
             name="email"
@@ -1682,6 +1691,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="password"
             name="password"
@@ -1707,6 +1717,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           <select
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control text-muted border-gray-600"
             id="country"
             name="country"
@@ -3037,6 +3048,7 @@ exports[`RegistrationPageTests should match default section snapshot 1`] = `
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             checked={false}
             className="form-check-input"
             id="optional"
@@ -3125,6 +3137,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="name"
             name="name"
@@ -3150,6 +3163,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="username"
             name="username"
@@ -3175,6 +3189,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="email"
             name="email"
@@ -3200,6 +3215,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control border-gray-600"
             id="password"
             name="password"
@@ -3225,6 +3241,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           <select
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             className="form-control text-muted border-gray-600"
             id="country"
             name="country"
@@ -4555,6 +4572,7 @@ exports[`RegistrationPageTests should match pending button state snapshot 1`] =
           <input
             aria-describedby=""
             aria-invalid={false}
+            autoComplete="on"
             checked={false}
             className="form-check-input"
             id="optional"
diff --git a/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap b/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap
index 7f675b3a..fde02f1c 100644
--- a/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap
+++ b/src/reset-password/tests/__snapshots__/ResetPasswordPage.test.jsx.snap
@@ -33,6 +33,7 @@ exports[`ResetPasswordPage should match invalid token message section snapshot 1
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="reset-password-input"
           name="new-password1"
@@ -58,6 +59,7 @@ exports[`ResetPasswordPage should match invalid token message section snapshot 1
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="confirm-password-input"
           name="new-password2"
@@ -132,6 +134,7 @@ exports[`ResetPasswordPage should match pending reset message section snapshot 1
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="reset-password-input"
           name="new-password1"
@@ -157,6 +160,7 @@ exports[`ResetPasswordPage should match pending reset message section snapshot 1
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="confirm-password-input"
           name="new-password2"
@@ -252,6 +256,7 @@ exports[`ResetPasswordPage should match reset password default section snapshot
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="reset-password-input"
           name="new-password1"
@@ -277,6 +282,7 @@ exports[`ResetPasswordPage should match reset password default section snapshot
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="confirm-password-input"
           name="new-password2"
@@ -389,6 +395,7 @@ exports[`ResetPasswordPage show spinner component during token validation 1`] =
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="reset-password-input"
           name="new-password1"
@@ -414,6 +421,7 @@ exports[`ResetPasswordPage show spinner component during token validation 1`] =
         <input
           aria-describedby=""
           aria-invalid={false}
+          autoComplete="on"
           className="form-control border-gray-600"
           id="confirm-password-input"
           name="new-password2"