diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm
index 2d69327b0..41d550095 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/2F/U2F.pm
@@ -104,7 +104,7 @@ sub verify {
                   . Crypt::U2F::Server::u2fclib_getError()
                   . ')' );
             $req->error(PE_U2FFAILED);
-            $req->authResult(PE_U2FFAILED);
+            #$req->authResult(PE_U2FFAILED);
             return $self->fail($req);
         }
     }
@@ -161,7 +161,7 @@ sub loadUser {
         }
     }
 
-    #### TOTO : MANAGE MULTI U2F KEYS
+    #### TODO : MANAGE MULTI U2F KEYS
     if (    ( $kh = $u2fs[0]{_keyHandle} )
         and ( $uk = $u2fs[0]{_userKey} ) )
     {
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/en.json b/lemonldap-ng-portal/site/htdocs/static/languages/en.json
index 5e8d04d0f..aaad26587 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/en.json
@@ -82,7 +82,7 @@
 "PE80":"This address is already used",
 "PE81":"Invalid authentication attempt",
 "PE82":"Exceeded authentication timeout",
-"PE83":"U2F verification failed",
+"PE83":"U2F verification failed. Retry or contact your administrator",
 "PE84":"You're not authorized to access to this host",
 "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry",
 "2FManagment":"2ndF Managment",
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/es.json b/lemonldap-ng-portal/site/htdocs/static/languages/es.json
index 2155a6970..74b87af50 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/es.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/es.json
@@ -82,7 +82,7 @@
 "PE80":"Esta dirección ya está utilizada",
 "PE81":"Invalid authentication attempt",
 "PE82":"Exceeded authentication timeout",
-"PE83":"U2F verification failed",
+"PE83":"U2F verification failed. Retry or contact your administrator",
 "PE84":"You're not authorized to access to this host",
 "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry",
 "2FManagment":"2ndF Managment",
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json
index 879065628..f52d53dcb 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/fr.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/fr.json
@@ -82,7 +82,7 @@
 "PE80":"Cette adresse est déjà utilisée",
 "PE81":"Tentative d'authentification invalide",
 "PE82":"Délai d'authentification dépassé",
-"PE83":"La vérification U2F a échoué",
+"PE83":"La vérification U2F a échoué. Réessayez ou contactez votre administrateur",
 "PE84":"Vous n'êtes pas autorisé à accéder à ce site",
 "PE85":"Le site souhaite une authentification plus récente (et le plugin UpgradeSession n'est pas chargé). Déconnectez-vous et réessayez",
 "2FManagment":"Gestionnaire 2ndF",
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json
index 1ecb31593..f3003923c 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/nl.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/nl.json
@@ -82,7 +82,7 @@
 "PE80":"Dit adres is al in gebruik",
 "PE81":"Invalid authentication attempt",
 "PE82":"Exceeded authentication timeout",
-"PE83":"U2F verification failed",
+"PE83":"U2F verification failed. Retry or contact your administrator",
 "PE84":"You're not authorized to access to this host",
 "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry",
 "2FManagment":"Gestionnaire 2ndF",
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json
index a69bb171b..d29d575aa 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/pt.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/pt.json
@@ -82,7 +82,7 @@
 "PE80":"Este endereço já é utilizado",
 "PE81":"Invalid authentication attempt",
 "PE82":"Exceeded authentication timeout",
-"PE83":"U2F verification failed",
+"PE83":"U2F verification failed. Retry or contact your administrator",
 "PE84":"You're not authorized to access to this host",
 "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry",
 "2FManagment":"Gestionnaire 2ndF",
diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json
index 1b5fd73c3..8fe6dfa11 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/ro.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/ro.json
@@ -82,7 +82,7 @@
 "PE80":"This address is already used",
 "PE81":"Invalid authentication attempt",
 "PE82":"Exceeded authentication timeout",
-"PE83":"U2F verification failed",
+"PE83":"U2F verification failed. Retry or contact your administrator",
 "PE84":"You're not authorized to access to this host",
 "PE85":"The remote site ask for a newer session (and UpgradeSession plugin isn't loaded). Logout and retry",
 "2FManagment":"Gestionnaire 2ndF",
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl b/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl
index 43dc8becf..5fd4d79d6 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/totp2fregister.tpl
@@ -25,7 +25,7 @@
         
       <span id="verify" class="btn btn-success" role="button">
         <span class="glyphicon glyphicon-check"></span>&nbsp;
-        <span trspan="verify">Verify</span>
+        <span trspan="register">Register</span>
       </span>
      </div>
     </div>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/u2fcheck.tpl b/lemonldap-ng-portal/site/templates/bootstrap/u2fcheck.tpl
index bde0dcca1..23bc7d62d 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/u2fcheck.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/u2fcheck.tpl
@@ -5,11 +5,11 @@
 <TMPL_IF NAME="AUTH_ERROR">
   <div class="message message-<TMPL_VAR NAME="AUTH_ERROR_TYPE"> alert"><span trmsg="<TMPL_VAR NAME="AUTH_ERROR">"></span></div>
 </TMPL_IF>
-
+<!--
 <TMPL_IF NAME="FAILED">
   <p trspan="u2fFailed"></p>
 </TMPL_IF>
-
+-->
 <TMPL_IF NAME="CHALLENGE">
   <div class="message message-positive alert"><span trspan="touchU2fDevice"></span></div>
   <form id="verify-form" action="/u2fcheck" method="post">