diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailReset.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailReset.pm
index 2767426b6..75a6e9b93 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailReset.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Plugins/MailReset.pm
@@ -278,7 +278,10 @@ sub _reset {
             $self->userLogger->notice(
                 'Reset mail already sent to ' . $req->{user} );
 
-            # To avoid enumeration, return OK
+            # Return mail already sent only if it is allowed at previous step
+            if ( $self->conf->{portalErrorOnMailNotFound} ) {
+                return PE_MAILCONFIRMATION_ALREADY_SENT;
+            }
             return PE_MAILCONFIRMOK;
         }
 
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
index c926dfa77..c3d7fceeb 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
@@ -66,6 +66,10 @@
         <input type="hidden" value="<TMPL_VAR NAME="MAIL">" name="mail">
       </TMPL_IF>
 
+      <TMPL_IF NAME="TOKEN">
+        <input type="hidden" name="token" value="<TMPL_VAR NAME="TOKEN">" />
+      </TMPL_IF>
+
       <h3 trspan="resendConfirmMail">Resend confirmation mail?</h3>
 
       <p class="alert alert-info">