diff --git a/core/modules/user/user.js b/core/modules/user/user.js
index 3bc95a8ecfe7469673e71b9c20b31807438dec2a..7c829b14c858272338046fd7136cbaaa985b6484 100644
--- a/core/modules/user/user.js
+++ b/core/modules/user/user.js
@@ -133,10 +133,10 @@
     var $usernameBox = $('input.username');
     var username = ($usernameBox.length > 0) ? $usernameBox.val() : translate.username;
 
-    // Lose 5 points for every character less than 6, plus a 30 point penalty.
-    if (password.length < 6) {
+    // Lose 5 points for every character less than 12, plus a 30 point penalty.
+    if (password.length < 12) {
       msg.push(translate.tooShort);
-      strength -= ((6 - password.length) * 5) + 30;
+      strength -= ((12 - password.length) * 5) + 30;
     }
 
     // Count weaknesses.
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 42e988706b99f346604d4561410f4b4208825ba9..4f8289b381ce651d3116d305babfaaa03123d10f 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1270,7 +1270,7 @@ function user_form_process_password_confirm($element) {
     $password_settings += array(
       'strengthTitle' => t('Password strength:'),
       'hasWeaknesses' => t('To make your password stronger:'),
-      'tooShort' => t('Make it at least 6 characters'),
+      'tooShort' => t('Make it at least 12 characters'),
       'addLowerCase' => t('Add lowercase letters'),
       'addUpperCase' => t('Add uppercase letters'),
       'addNumbers' => t('Add numbers'),