Index: wp-admin/users.php
===================================================================
--- wp-admin/users.php	(revision 13869)
+++ wp-admin/users.php	(working copy)
@@ -368,9 +368,10 @@
 	$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>
Index: wp-includes/capabilities.php
===================================================================
--- wp-includes/capabilities.php	(revision 13869)
+++ wp-includes/capabilities.php	(working copy)
@@ -698,8 +698,8 @@
 	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();
 	}