diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm
index 748812f3d..025ba45ab 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailPasswordReset.pm
@@ -633,8 +633,8 @@ sub display {
         DISPLAY_CONFIRMMAILSENT => 0,
         DISPLAY_MAILSENT        => 0,
         DISPLAY_PASSWORD_FORM   => 0,
-        ENABLE_PASSWORD_DISPLAY =>
-              $self->conf->{portalEnablePasswordDisplay},
+        ENABLE_PASSWORD_DISPLAY => $self->conf->{portalEnablePasswordDisplay},
+        DONT_STORE_PASSWORD     => $self->conf->{browsersDontStorePassword},
         DISPLAY_PPOLICY  => $self->conf->{portalDisplayPasswordPolicy} && $isPP,
         PPOLICY_MINSIZE  => $self->conf->{passwordPolicyMinSize},
         PPOLICY_MINLOWER => $self->conf->{passwordPolicyMinLower},
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
index e975f2519..9d78a1328 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
@@ -120,23 +120,41 @@
           <div class="input-group-prepend">
             <span class="input-group-text"><label for="newpassword" class="mb-0"><i class="fa fa-lock"></i></label></span>
           </div>
-          <input id="newpassword" name="newpassword" type="password" class="form-control" trplaceholder="newPassword" />
-          <TMPL_IF NAME="ENABLE_PASSWORD_DISPLAY">
-            <div class="input-group-append">
-              <span class="input-group-text"><i name="newpassword" class="fa fa-eye-slash toggle-password"></i></span>
-            </div>
+          <TMPL_IF NAME="DONT_STORE_PASSWORD">
+            <input id="newpassword" name="newpassword" type="text" class="form-control" trplaceholder="newPassword" autocomplete="off" required aria-required="true"/>
+            <TMPL_IF NAME="ENABLE_PASSWORD_DISPLAY">
+              <div class="input-group-append">
+                <span class="input-group-text"><i name="newpassword" class="fa fa-eye-slash toggle-password"></i></span>
+              </div>
+            </TMPL_IF>
+          <TMPL_ELSE>
+            <input id="newpassword" name="newpassword" type="password" class="form-control" trplaceholder="newPassword" required aria-required="true"/>
+            <TMPL_IF NAME="ENABLE_PASSWORD_DISPLAY">
+              <div class="input-group-append">
+                <span class="input-group-text"><i name="newpassword" class="fa fa-eye-slash toggle-password"></i></span>
+              </div>
+            </TMPL_IF>
           </TMPL_IF>
         </div>
 
-        <div class="input-group mb-3">
+        <div class="form-group input-group">
           <div class="input-group-prepend">
             <span class="input-group-text"><label for="confirmpassword" class="mb-0"><i class="fa fa-lock"></i></label></span>
           </div>
-          <input id="confirmpassword" name="confirmpassword" type="password" class="form-control" trplaceholder="confirmPwd" />
-          <TMPL_IF NAME="ENABLE_PASSWORD_DISPLAY">
-            <div class="input-group-append">
-              <span class="input-group-text"><i name="newpassword" class="fa fa-eye-slash toggle-password"></i></span>
-            </div>
+          <TMPL_IF NAME="DONT_STORE_PASSWORD">
+            <input id="confirmpassword" name="confirmpassword" type="text" class="form-control" trplaceholder="confirmPwd" autocomplete="off" required aria-required="true"/>
+            <TMPL_IF NAME="ENABLE_PASSWORD_DISPLAY">
+              <div class="input-group-append">
+                <span class="input-group-text"><i name="confirmpassword" class="fa fa-eye-slash toggle-password"></i></span>
+              </div>
+            </TMPL_IF>
+          <TMPL_ELSE>
+            <input id="confirmpassword" name="confirmpassword" type="password" class="form-control" trplaceholder="confirmPwd" required aria-required="true"/>
+            <TMPL_IF NAME="ENABLE_PASSWORD_DISPLAY">
+              <div class="input-group-append">
+                <span class="input-group-text"><i name="confirmpassword" class="fa fa-eye-slash toggle-password"></i></span>
+              </div>
+            </TMPL_IF>
           </TMPL_IF>
         </div>