diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 2ce361ee94..4591133309 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -216,6 +216,7 @@ if ($user_already_registered_show_terms === false) {
         $form->addText(
             'username',
             get_lang('UserName'),
+            true,
             array(
                 'id' => 'username',
                 'size' => USERNAME_MAX_LENGTH,
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 040bb2d894..30ba6be170 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -7173,7 +7173,7 @@ function api_get_password_checker_js($usernameInputId, $passwordInputId)
     $js = api_get_asset('pwstrength-bootstrap/dist/pwstrength-bootstrap.min.js');
 
     $js .=  "<script>
-    $(document).ready(function() {      
+    $(document).ready(function() {
         var lang = ".json_encode($translations).";            
         var options = {
             common : {
@@ -7226,9 +7226,9 @@ function api_get_password_checker_js($usernameInputId, $passwordInputId)
             onLoad : function () {
                 //$('#messages').text('Start typing password');
             },
-            onKeyUp: function (evt) {
-                $(evt.target).pwstrength('outputErrorList');
-            },
+            onKeyUp: function (evt) {            
+                $(evt.target).pwstrength('outputErrorList');                
+            },            
             viewports: {
                 progress: '#password_progress',
                 verdict: '#password-verdict',
@@ -7243,6 +7243,12 @@ function api_get_password_checker_js($usernameInputId, $passwordInputId)
             }
         };
         $('".$passwordInputId."').pwstrength(options);
+        
+        $('".$passwordInputId."').on('input', function() {
+            $(this).parent().find('.help-inline').hide();
+            
+        });
+        
     });
     </script>";