diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 14fb713575..7a72297534 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -834,14 +834,13 @@ function default_password_nag_handler($errors = false) {
 
 add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
 function default_password_nag_edit_user($user_ID, $old_data) {
-	global $user_ID;
-	if ( ! get_user_option('default_password_nag') ) //Short circuit it.
+	if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it.
 		return;
 
 	$new_data = get_userdata($user_ID);
 
 	if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
-		delete_user_setting('default_password_nag');
+		delete_user_setting('default_password_nag', $user_ID);
 		update_user_option($user_ID, 'default_password_nag', false, true);
 	}
 }