diff --git a/app/javascript/v3/views/auth/password/Edit.vue b/app/javascript/v3/views/auth/password/Edit.vue
index 4d8963b2e..af40f8c2f 100644
--- a/app/javascript/v3/views/auth/password/Edit.vue
+++ b/app/javascript/v3/views/auth/password/Edit.vue
@@ -104,6 +104,7 @@ export default {
           v-model="credentials.password"
           name="password"
           type="password"
+          autocomplete="new-password"
           :message-type="v$.credentials.password.$error ? 'error' : ''"
           :message="
             v$.credentials.password.$error
@@ -117,6 +118,7 @@ export default {
           v-model="credentials.confirmPassword"
           name="confirm_password"
           type="password"
+          autocomplete="confirm-password"
           :message-type="v$.credentials.confirmPassword.$error ? 'error' : ''"
           :message="
             v$.credentials.confirmPassword.$error
diff --git a/app/javascript/v3/views/login/Index.vue b/app/javascript/v3/views/login/Index.vue
index 5eb51c2d9..9ad63686d 100644
--- a/app/javascript/v3/views/login/Index.vue
+++ b/app/javascript/v3/views/login/Index.vue
@@ -12,7 +12,7 @@ import { useBranding } from 'shared/composables/useBranding';
 
 // components
 import SimpleDivider from '../../components/Divider/SimpleDivider.vue';
-import FormInput from '../../components/Form/Input.vue';
+import FormInput from 'dashboard/components-next/input/Input.vue';
 import GoogleOAuthButton from '../../components/GoogleOauth/Button.vue';
 import Spinner from 'shared/components/Spinner.vue';
 import Icon from 'dashboard/components-next/icon/Icon.vue';
@@ -287,11 +287,12 @@ export default {
             name="email_address"
             type="text"
             data-testid="email_input"
+            autocomplete="email"
             :tabindex="1"
             required
             :label="$t('LOGIN.EMAIL.LABEL')"
             :placeholder="$t('LOGIN.EMAIL.PLACEHOLDER')"
-            :has-error="v$.credentials.email.$error"
+            :message-type="v$.credentials.email.$error ? 'error' : ''"
             @input="v$.credentials.email.$touch"
           />
           <FormInput
@@ -299,22 +300,28 @@ export default {
             type="password"
             name="password"
             data-testid="password_input"
+            autocomplete="current-password"
             required
             :tabindex="2"
             :label="$t('LOGIN.PASSWORD.LABEL')"
             :placeholder="$t('LOGIN.PASSWORD.PLACEHOLDER')"
-            :has-error="v$.credentials.password.$error"
+            :message-type="v$.credentials.password.$error ? 'error' : ''"
             @input="v$.credentials.password.$touch"
           >
-            <p v-if="!globalConfig.disableUserProfileUpdate">
-              <router-link
-                to="auth/reset/password"
-                class="text-sm text-link"
-                tabindex="4"
+            <template #prefix>
+              <p
+                v-if="!globalConfig.disableUserProfileUpdate"
+                class="absolute ltr:right-0 rtl:left-0"
               >
-                {{ $t('LOGIN.FORGOT_PASSWORD') }}
-              </router-link>
-            </p>
+                <router-link
+                  to="auth/reset/password"
+                  class="text-sm text-link"
+                  tabindex="4"
+                >
+                  {{ $t('LOGIN.FORGOT_PASSWORD') }}
+                </router-link>
+              </p>
+            </template>
           </FormInput>
           <NextButton
             lg