Index: wp-includes/user-functions.php
===================================================================
--- wp-includes/user-functions.php	(revision 35429)
+++ wp-includes/user-functions.php	(working copy)
@@ -1330,7 +1330,7 @@
 	 */
 	if ( in_array( $user_login, apply_filters( 'illegal_user_logins', array() ) ) ) {
 		return new WP_Error( 'illegal_user_login', __( 'Sorry, that username is not allowed.' ) );
-	}	
+	}
 
 	/*
 	 * If a nicename is provided, remove unsafe user characters before using it.
@@ -1636,7 +1636,7 @@
 		 * @param array $userdata The updated user array.
 		 *
 		 */
-		$send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata );
+		$send_password_change_email = apply_filters( 'send_password_change_email', ! current_user_can( 'manage_options' ), $user, $userdata );
 	}
 
 	if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) {
@@ -1652,7 +1652,7 @@
 		 * @param array $userdata The updated user array.
 		 *
 		 */
-		$send_email_change_email = apply_filters( 'send_email_change_email', true, $user, $userdata );
+		$send_email_change_email = apply_filters( 'send_email_change_email', ! current_user_can( 'manage_options' ), $user, $userdata );
 	}
 
 	wp_cache_delete( $user['user_email'], 'useremail' );