diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index f47cadf8c5..bfd448f808 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -347,7 +347,7 @@ function default_password_nag_edit_user($user_ID, $old_data) {
 	$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', $user_ID);
+		delete_user_setting('default_password_nag');
 		update_user_option($user_ID, 'default_password_nag', false, true);
 	}
 }
diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php
index 38db88f330..88237e06c1 100644
--- a/wp-includes/rewrite.php
+++ b/wp-includes/rewrite.php
@@ -89,7 +89,7 @@ function add_feed($feedname, $function) {
 		$wp_rewrite->feeds[] = $feedname;
 	$hook = 'do_feed_' . $feedname;
 	// Remove default function hook
-	remove_action($hook, $hook, 10, 1);
+	remove_action($hook, $hook);
 	add_action($hook, $function, 10, 1);
 	return $hook;
 }