diff --git a/index.php b/index.php
index f3fadcafc735..1f7eca251e68 100644
--- a/index.php
+++ b/index.php
@@ -21,6 +21,12 @@
  */
 require_once 'libraries/display_git_revision.lib.php';
 
+$response = PMA\libraries\Response::getInstance();
+$header   = $response->getHeader();
+$scripts  = $header->getScripts();
+$scripts->addFile('server_privileges.js');
+$scripts->addFile('zxcvbn.js');
+
 /**
  * pass variables to child pages
  */
diff --git a/js/server_privileges.js b/js/server_privileges.js
index b7d1677f7983..2101105c7856 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -31,14 +31,16 @@ function checkAddUser(the_form)
     return PMA_checkPassword($(the_form));
 } // end of the 'checkAddUser()' function
 
-
-function checkPasswordStrength(value, meter_obj, meter_object_label) {
-    var zxcvbn_obj = zxcvbn(value);
+function checkPasswordStrength(value, meter_obj, meter_object_label, username = null) {
+    customDict = ['phpmyadmin', 'mariadb', 'mysql', 'admin']; //This list may be modified.
+    if (username != null)
+        customDict.push(username)
+    var zxcvbn_obj = zxcvbn(value,customDict);
     var strength = zxcvbn_obj.score;
-    meter_obj.val(strength);
     strength = parseInt(strength);
+    meter_obj.val(strength);
     switch(strength){
-        case 0: meter_obj_label.html('Too short');
+        case 0: meter_obj_label.html('Extremely weak');
                 break;
         case 1: meter_obj_label.html('Very weak');
                 break;
@@ -117,12 +119,14 @@ AJAX.registerOnload('server_privileges.js', function () {
     $('#text_pma_pw').on('keyup', function () {
         meter_obj = $('#password_strength_meter');
         meter_obj_label = $('#password_strength');
-        checkPasswordStrength($(this).val(), meter_obj, meter_obj_label);
+        username = $('input[name="username"]');
+        username = username.val();
+        checkPasswordStrength($(this).val(), meter_obj, meter_obj_label, username);
     });
 
     $('#text_pma_change_pw').on('keyup', function () {
         meter_obj = $('#change_password_strength_meter');
-        meter_obj_label = $('#cahnge_password_strength');
+        meter_obj_label = $('#change_password_strength');
         checkPasswordStrength($(this).val(), meter_obj, meter_obj_label);
     });