diff --git a/templates/partials/account_form.html b/templates/partials/account_form.html
index 4d135a56..28dc0cd5 100644
--- a/templates/partials/account_form.html
+++ b/templates/partials/account_form.html
@@ -246,7 +246,7 @@
                 <label for="id_passwd1">
                     {% trans %}Password{% endtrans %}:
                 </label>
-                <input id="id_passwd1" type="password"
+                <input id="id_passwd1" type="password" autocomplete="new-password"
                        size="30" name="P" value="{{ P or '' }}">
             </p>
 
@@ -255,7 +255,7 @@
                     {% trans %}Re-type password{% endtrans %}:
                 </label>
 
-                <input id="id_passwd2" type="password"
+                <input id="id_passwd2" type="password" autocomplete="new-password"
                        size="30" name="C" value="{{ C or '' }}">
             </p>
         </fieldset>
@@ -333,7 +333,7 @@
                 <label for="id_passwd_current">
                     {% trans %}Your current password{% endtrans %}:
                 </label>
-                <input id="id_passwd_current" type="password"
+                <input id="id_passwd_current" type="password" autocomplete="current-password"
                        size="30" name="passwd" id="id_passwd_current">
             </p>
         {% else %}
diff --git a/templates/passreset.html b/templates/passreset.html
index 6a31109f..08493fe9 100644
--- a/templates/passreset.html
+++ b/templates/passreset.html
@@ -26,14 +26,14 @@
                             <tr>
                                 <td>{% trans %}Enter your new password:{% endtrans %}</td>
                                 <td>
-                                    <input type="password" name="password" size="30"
+                                    <input type="password" name="password" size="30" autocomplete="new-password"
                                            value="{{ password or '' }}">
                                 </td>
                             </tr>
                             <tr>
                                 <td>{% trans %}Confirm your new password:{% endtrans %}</td>
                                 <td>
-                                    <input type="password" name="confirm" size="30"
+                                    <input type="password" name="confirm" size="30" autocomplete="new-password"
                                            value="{{ confirm or '' }}">
                                 </td>
                             </tr>