diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index 9d2b00d5b8..27a22c00c0 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -25,8 +25,8 @@ if ($checkPass == 'true') {
     $htmlHeadXtra[] = '
     <script>
     $(document).ready(function() {
-        $("input[name=\'password[password_auto]\']").each(function(index, value) {
-            $(this).click(function() {
+        $("#password").keypress(function() {
+            $("#password").each(function(index, value) {
                 var value = $(this).attr("value");
                 if (value == 0) {
                     $("#password_progress").show();
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index a1de398101..babce73bc5 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -617,11 +617,16 @@ class Template
 
         $isoCode = api_get_language_isocode();
 
-        //JS files
+        $selectLink = 'bootstrap-select/js/i18n/defaults-' . $isoCode . '_' . strtoupper($isoCode) . '.min.js';
+
+        if ($isoCode == 'en') {
+            $selectLink = 'bootstrap-select/js/i18n/defaults-' . $isoCode . '_US.min.js';
+        }
+        // JS files
         $js_files = array(
             'chosen/chosen.jquery.min.js',
             'bootstrap-select/js/bootstrap-select.min.js',
-            'bootstrap-select/js/i18n/defaults-' . $isoCode . '_' . strtoupper($isoCode) . '.min.js'
+            $selectLink
         );
 
         $viewBySession = api_get_setting('my_courses_view_by_session') === 'true';