diff --git a/wp-login.php b/wp-login.php
index 512e3d177..16f4161ed 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -312,6 +312,8 @@ function register_new_user($user_login, $user_email) {
 		return $errors;
 	}
 
+	update_user_option($user_id, 'default_password_nag', true, true); //Set up the Password change nag.
+
 	wp_new_user_notification($user_id, $user_pass);
 
 	return $user_id;