diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 379dcd4fd..1aa3c35ae 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -79,7 +79,7 @@ function edit_user( $user_id = 0 ) {
 		$potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
 		// Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
 		// Multisite super admins can freely edit their blog roles -- they possess all caps.
-		if ( ( is_multisite() && is_site_admin() ) || $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
+		if ( ( is_multisite() && is_super_admin() ) || $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
 			$user->role = $new_role;
 
 		// If the new role isn't editable by the logged-in user die with error
diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index 12d8056a6..d99ae9b1d 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -101,7 +101,7 @@ endif;
  * @deprecated Use $GLOBALS['current_user']->ID
  */
 function get_current_user_id() {
-	_deprecated_function( __FUNCTION__, '3.0', '$GLOBALS\'current_user\']->ID' );
+	_deprecated_function( __FUNCTION__, '3.0', '$GLOBALS[\'current_user\']->ID' );
 	return $GLOBALS['current_user']->ID;
 }