diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 63fbbaab66..868d4b4054 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -64,7 +64,7 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated
$user_password = trim($user_password);
$email_password = false;
if ( !$user_id && empty($user_password) ) {
- $user_password = wp_generate_password();
+ $user_password = wp_generate_password( 12, false );
$message = __('Note that password carefully! It is a random password that was generated just for you.');
$user_id = wp_create_user($user_name, $user_password, $user_email);
update_user_option($user_id, 'default_password_nag', true, true);
diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index 5daac776c3..ea65a5a589 100644
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -57,7 +57,7 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
$password = 'N/A';
$user_id = email_exists($email);
if ( !$user_id ) { // Create a new user with a random password
- $password = wp_generate_password();
+ $password = wp_generate_password( 12, false );
$user_id = wpmu_create_user( $domain, $password, $email );
if ( false == $user_id )
wp_die( __( 'There was an error creating the user.' ) );
diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php
index ea2463a60b..fdf81ceac4 100644
--- a/wp-admin/network/user-new.php
+++ b/wp-admin/network/user-new.php
@@ -31,7 +31,7 @@ if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
elseif ( empty($user['email']) )
wp_die( __( 'Missing email.' ) );
- $password = wp_generate_password();
+ $password = wp_generate_password( 12, false);
$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) );
if ( false == $user_id )
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 54296e8246..7bf53f03fc 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -779,7 +779,7 @@ function wpmu_activate_signup($key) {
$meta = unserialize($signup->meta);
$user_login = $wpdb->escape($signup->user_login);
$user_email = $wpdb->escape($signup->user_email);
- $password = wp_generate_password();
+ $password = wp_generate_password( 12, false );
$user_id = username_exists($user_login);
diff --git a/wp-login.php b/wp-login.php
index ae35b31645..120a181fb9 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -320,7 +320,7 @@ function register_new_user( $user_login, $user_email ) {
if ( $errors->get_error_code() )
return $errors;
- $user_pass = wp_generate_password();
+ $user_pass = wp_generate_password( 12, false);
$user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
if ( ! $user_id ) {
$errors->add( 'registerfail', sprintf( __( 'ERROR: Couldn’t register you... please contact the webmaster !' ), get_option( 'admin_email' ) ) );