diff --git a/templates/customer/password-email.tpl b/templates/customer/password-email.tpl
index 08565fdff..0014e993f 100644
--- a/templates/customer/password-email.tpl
+++ b/templates/customer/password-email.tpl
@@ -27,7 +27,7 @@
     <section class="form-fields">
       <div class="mb-3">
         <label class="form-label required">{l s='Email address' d='Shop.Forms.Labels'}</label>
-        <input type="email" name="email" id="email" value="{if isset($smarty.post.email)}{stripslashes($smarty.post.email)}{/if}" class="form-control" required>
+        <input type="email" name="email" id="email" value="{if isset($smarty.post.email)}{stripslashes($smarty.post.email)}{/if}" class="form-control" autocomplete="email" required>
       </div>
       <button id="send-reset-link" class="form-control-submit btn btn-primary" name="submit" type="submit">
         {l s='Send reset link' d='Shop.Theme.Actions'}
diff --git a/templates/customer/password-new.tpl b/templates/customer/password-new.tpl
index 21745350a..d49e626a3 100644
--- a/templates/customer/password-new.tpl
+++ b/templates/customer/password-new.tpl
@@ -32,7 +32,7 @@
       <div class="mb-3">
         <label class="form-label">{l s='New password' d='Shop.Forms.Labels'}</label>
         <div class="input-group password-field js-parent-focus">
-          <input class="form-control js-child-focus js-visible-password" type="password" data-validate="isPasswd" name="passwd" value="">
+          <input class="form-control js-child-focus js-visible-password" type="password" data-validate="isPasswd" name="passwd" value="" autocomplete="new-password">
           <button
             class="btn btn-primary"
             type="button"
@@ -49,7 +49,7 @@
       <div class="mb-3">
         <label class="form-label">{l s='Confirmation' d='Shop.Forms.Labels'}</label>
         <div class="input-group password-field js-parent-focus">
-        <input class="form-control js-child-focus js-visible-password" type="password" data-validate="isPasswd" name="confirmation" value="">
+        <input class="form-control js-child-focus js-visible-password" type="password" data-validate="isPasswd" name="confirmation" value="" autocomplete="new-password">
           <button
             class="btn btn-primary"
             type="button"