diff --git a/server/views/partials/admin/dialog/create_user.hbs b/server/views/partials/admin/dialog/create_user.hbs
index 8d0dcca6e..07c1a3bb0 100644
--- a/server/views/partials/admin/dialog/create_user.hbs
+++ b/server/views/partials/admin/dialog/create_user.hbs
@@ -26,6 +26,7 @@
         type="password"
         placeholder="Password..."
         hx-preserve="true"
+        autocomplete="new-password"
       />
       {{#if errors.password}}<p class="error">{{errors.password}}</p>{{/if}}
     </label>
diff --git a/server/views/partials/reset_password/new_password_form.hbs b/server/views/partials/reset_password/new_password_form.hbs
index 3f4e9a466..11d926786 100644
--- a/server/views/partials/reset_password/new_password_form.hbs
+++ b/server/views/partials/reset_password/new_password_form.hbs
@@ -14,7 +14,8 @@
       type="password" 
       placeholder="New password..."
       hx-preserve="true"
-      required 
+      required
+      autocomplete="new-password"
     />
     {{#if errors.new_password}}<p class="error">{{errors.new_password}}</p>{{/if}}
   </label>
@@ -26,7 +27,8 @@
       type="password" 
       placeholder="Repeat password..."
       hx-preserve="true"
-      required 
+      required
+      autocomplete="new-password"
     />
     {{#if errors.repeat_password}}<p class="error">{{errors.repeat_password}}</p>{{/if}}
   </label>
diff --git a/server/views/partials/settings/change_password.hbs b/server/views/partials/settings/change_password.hbs
index cc74a2ccc..324448184 100644
--- a/server/views/partials/settings/change_password.hbs
+++ b/server/views/partials/settings/change_password.hbs
@@ -30,6 +30,7 @@
           type="password" 
           placeholder="New password..."
           hx-preserve="true"
+          autocomplete="new-password"
         />
         {{#if errors.newpassword}}<p class="error">{{errors.newpassword}}</p>{{/if}}
       </label>
diff --git a/server/views/partials/shortener.hbs b/server/views/partials/shortener.hbs
index c9e5ecfb5..802dcbcfa 100644
--- a/server/views/partials/shortener.hbs
+++ b/server/views/partials/shortener.hbs
@@ -104,7 +104,7 @@
             name="password" 
             placeholder="Password..." 
             hx-preserve="true" 
-            autocomplete="off" 
+            autocomplete="new-password"
           />
           {{#if errors.password}}<p class="error">{{errors.password}}</p>{{/if}}
         </label>