diff --git a/modules/user/user.js b/modules/user/user.js
index 1430262..fc3bf62 100644
--- a/modules/user/user.js
+++ b/modules/user/user.js
@@ -156,6 +156,14 @@ Drupal.evaluatePasswordStrength = function (password, translate) {
     strength = 5;
   }

+  // Check if password starts with 'password'.
+  if (password.search('password') == 0) {
+    msg.push(translate.isPassword);
+    // Passwords that start with 'password' always very weak.
+    strength = 5;
+  }
+
   // Based on the strength, work out what text should be shown by the password strength meter.
   if (strength < 60) {
     indicatorText = translate.weak;
diff --git a/modules/user/user.module b/modules/user/user.module
index b7ebfdd..058ec81 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -3461,6 +3461,7 @@ function user_form_process_password_confirm($element) {
       'addNumbers' => t('Add numbers'),
       'addPunctuation' => t('Add punctuation'),
       'sameAsUsername' => t('Make it different from your username'),
+      'isPassword' => t('Do not use "password" for your password.'),
       'confirmSuccess' => t('yes'),
       'confirmFailure' => t('no'),
       'weak' => t('Weak'),