diff --git a/wp-admin/users.php b/wp-admin/users.php
index 83ed449ee..9860cc033 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -368,9 +368,10 @@ foreach ( $wp_user_search->get_results() as $userid ) {
 	$user_object = new WP_User($userid);
 	$roles = $user_object->roles;
 	$role = array_shift($roles);
-
-	$style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
-	echo "\n\t", user_row( $user_object, $style, $role, $post_counts[ $userid ] );
+	if ( is_multisite() && ! empty($role) ) {
+		$style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
+		echo "\n\t", user_row( $user_object, $style, $role, $post_counts[ $userid ] );
+	}
 }
 ?>
 </tbody>
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 774396ba1..f19d4fbf1 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -698,8 +698,8 @@ class WP_User {
 	function remove_all_caps() {
 		global $wpdb;
 		$this->caps = array();
-		update_user_meta( $this->ID, $this->cap_key, '' );
-		update_user_meta( $this->ID, $wpdb->prefix . 'user_level', '' );
+		delete_user_meta( $this->ID, $this->cap_key );
+		delete_user_meta( $this->ID, $wpdb->prefix . 'user_level' );
 		$this->get_role_caps();
 	}