diff --git a/client/src/components/Login/ChangePassword.vue b/client/src/components/Login/ChangePassword.vue
index 0c761c98ecd3..8aa4f78650c7 100644
--- a/client/src/components/Login/ChangePassword.vue
+++ b/client/src/components/Login/ChangePassword.vue
@@ -50,15 +50,15 @@ async function submit() {
 
         <BCard header="Change your password">
             <BFormGroup v-if="expiredUser" label="Current Password">
-                <BFormInput v-model="current" type="password" />
+                <BFormInput v-model="current" type="password" autocomplete="current-password" />
             </BFormGroup>
 
             <BFormGroup label="New Password">
-                <BFormInput v-model="password" type="password" />
+                <BFormInput v-model="password" type="password" autocomplete="new-password" />
             </BFormGroup>
 
             <BFormGroup label="Confirm password">
-                <BFormInput v-model="confirm" type="password" />
+                <BFormInput v-model="confirm" type="password" autocomplete="new-password" />
             </BFormGroup>
 
             <BButton type="submit">Save new password</BButton>
diff --git a/client/src/components/Login/LoginForm.vue b/client/src/components/Login/LoginForm.vue
index eb770103086a..4ad09ebb0d57 100644
--- a/client/src/components/Login/LoginForm.vue
+++ b/client/src/components/Login/LoginForm.vue
@@ -195,7 +195,8 @@ function returnToLogin() {
                                             required
                                             :state="passwordState"
                                             name="password"
-                                            type="password" />
+                                            type="password"
+                                            autocomplete="current-password" />
 
                                         <BFormText v-if="showResetLink">
                                             <span v-localize>Forgot password?</span>
diff --git a/client/src/components/Login/RegisterForm.vue b/client/src/components/Login/RegisterForm.vue
index 25546ed46804..46273e83d77b 100644
--- a/client/src/components/Login/RegisterForm.vue
+++ b/client/src/components/Login/RegisterForm.vue
@@ -144,6 +144,7 @@ async function submit() {
                                         v-model="password"
                                         name="password"
                                         type="password"
+                                        autocomplete="new-password"
                                         required />
                                 </BFormGroup>
 
@@ -153,6 +154,7 @@ async function submit() {
                                         v-model="confirm"
                                         name="confirm"
                                         type="password"
+                                        autocomplete="new-password"
                                         required />
                                 </BFormGroup>