Index: wp-admin/includes/class-wp-users-list-table.php
===================================================================
--- wp-admin/includes/class-wp-users-list-table.php	(revision 16559)
+++ wp-admin/includes/class-wp-users-list-table.php	(working copy)
@@ -7,7 +7,23 @@
  * @since 3.1.0
  */
 class WP_Users_List_Table extends WP_List_Table {
+	
+	var $site_id;
+	var $is_site_users;
+	
+	function WP_Users_List_Table() {
+		$screen = get_current_screen();
+		$this->is_site_users = ( 'site-users-network' == $screen->id ) ? true : false;
 
+		if ( $this->is_site_users )
+			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+
+		parent::WP_List_Table( array(
+			'singular' => 'user',
+			'plural'   => 'users'
+		) );
+	}
+
 	function check_permissions() {
 		if ( !current_user_can('list_users') )
 			wp_die(__('Cheatin’ uh?'));
@@ -30,6 +46,9 @@
 			'role' => $role,
 			'search' => $usersearch
 		);
+		
+		if ( $this->is_site_users )
+			$args['blog_id'] = $this->site_id;
 
 		if ( isset( $_REQUEST['orderby'] ) )
 			$args['orderby'] = $_REQUEST['orderby'];
@@ -59,11 +78,16 @@
 		$total_users = $users_of_blog['total_users'];
 		$avail_roles =& $users_of_blog['avail_roles'];
 		unset($users_of_blog);
+		
+		if ( $this->is_site_users )
+			$url = 'site-users.php?id=' . $this->site_id;
+		else
+			$url = 'users.php';
 
 		$current_role = false;
 		$class = empty($role) ? ' class="current"' : '';
 		$role_links = array();
-		$role_links['all'] = "<a href='users.php'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
+		$role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
 		foreach ( $wp_roles->get_names() as $this_role => $name ) {
 			if ( !isset($avail_roles[$this_role]) )
 				continue;
@@ -78,7 +102,7 @@
 			$name = translate_user_role( $name );
 			/* translators: User role name with count */
 			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, $avail_roles[$this_role] );
-			$role_links[$this_role] = "<a href='users.php?role=$this_role'$class>$name</a>";
+			$role_links[$this_role] = "<a href='" . add_query_arg( 'role', $this_role, $url ) . "'$class>$name</a>";
 		}
 
 		return $role_links;
@@ -171,6 +195,11 @@
 			$user_object = new WP_User( (int) $user_object );
 		$user_object = sanitize_user_object( $user_object, 'display' );
 		$email = $user_object->user_email;
+		
+		if ( $this->is_site_users )
+			$url = "site-users.php?id={$this->site_id}&amp;";
+		else
+			$url = 'users.php?';
 
 		$checkbox = '';
 		// Check if the user for this row is editable
@@ -197,7 +226,7 @@
 			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
 				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
 			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( "$url?action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
 			$actions = apply_filters( 'user_row_actions', $actions, $user_object );
 			$edit .= $this->row_actions( $actions );
 
Index: wp-admin/network/site-users.php
===================================================================
--- wp-admin/network/site-users.php	(revision 16559)
+++ wp-admin/network/site-users.php	(working copy)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Edit Site Users Administration Screen
+ * Edit Site Themes Administration Screen
  *
  * @package WordPress
  * @subpackage Multisite
@@ -13,9 +13,17 @@
 if ( ! is_multisite() )
 	wp_die( __( 'Multisite support is not enabled.' ) );
 
-if ( ! current_user_can('manage_sites') )
-	wp_die(__('You do not have sufficient permissions to edit this site.'));
+$wp_list_table = get_list_table('WP_Users_List_Table');
+$wp_list_table->check_permissions();
+$wp_list_table->prepare_items();
 
+$action = $wp_list_table->current_action();
+
+$s = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
+
+// Clean up request URI from temporary args for screen options/paging uri's to work as expected.
+$_SERVER['REQUEST_URI'] = remove_query_arg(array('enable', 'disable', 'enable-selected', 'disable-selected'), $_SERVER['REQUEST_URI']);
+
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
 
 if ( ! $id )
@@ -38,7 +46,9 @@
 	$editblog_roles = $wp_roles->roles;
 }
 
-if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] ) {
+$action = $wp_list_table->current_action();
+
+if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
 	check_admin_referer( 'edit-site' );
 
 	switch_to_blog( $id );
@@ -107,6 +117,8 @@
 		$messages[] = __('Site users updated.');
 }
 
+add_screen_option( 'per_page', array( 'label' => _x( 'Users', 'users per page (screen options)' ) ) );
+
 $title = sprintf( __('Edit Site: %s'), get_blogaddress_by_id($id));
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
@@ -128,56 +140,22 @@
 }
 ?>
 </h3>
-<?php
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated"><p>' . $msg . '</p></div>';
-} ?>
+<form method="get" action="">
+<p class="search-box">
+	<label class="screen-reader-text" for="user-search-input"><?php _e( 'Search Users' ); ?>:</label>
+	<input type="text" id="user-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+	<?php submit_button( __( 'Search Users' ), 'button', '', false ); ?>
+</p>
+</form>
+
+<?php //$wp_list_table->views(); ?>
+
 <form method="post" action="site-users.php?action=update-site">
 	<?php wp_nonce_field( 'edit-site' ); ?>
 	<input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
-<?php
-$blogusers = get_users( array( 'blog_id' => $id, 'number' => 20 ) );
 
-if ( is_array( $blogusers ) ) {
-	echo '<table class="form-table">';
-	echo "<tr><th>" . __( 'User' ) . "</th><th>" . __( 'Role' ) . "</th><th>" . __( 'Password' ) . "</th><th>" . __( 'Remove' ) . "</th></tr>";
-	$user_count = 0;
+<?php $wp_list_table->display(); ?>
 
-	foreach ( $blogusers as $user_id => $user_object ) {
-		$user_count++;
-		$existing_role = reset( $user_object->roles );
-
-		echo '<tr><td><a href="user-edit.php?user_id=' . $user_id . '">' . $user_object->user_login . '</a></td>';
-		if ( $user_id != $current_user->data->ID ) {
-			?>
-			<td>
-				<select name="role[<?php echo $user_id ?>]" id="new_role_1"><?php
-					foreach ( $editblog_roles as $role => $role_assoc ){
-						$name = translate_user_role( $role_assoc['name'] );
-						echo '<option ' . selected( $role, $existing_role, false ) . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
-					}
-					?>
-				</select>
-			</td>
-			<td>
-				<input type="text" name="user_password[<?php echo esc_attr( $user_id ) ?>]" />
-			</td>
-			<?php
-			echo '<td><input title="' . __( 'Click to remove user' ) . '" type="checkbox" name="blogusers[' . esc_attr( $user_id ) . ']" /></td>';
-		} else {
-			echo "<td><strong>" . __ ( 'N/A' ) . "</strong></td><td><strong>" . __ ( 'N/A' ) . "</strong></td><td><strong>" . __( 'N/A' ) . "</strong></td>";
-		}
-		echo '</tr>';
-	}
-	echo "</table>";
-	submit_button();
-	if ( 20 == $user_count )
-		echo '<p>' . sprintf( __('First 20 users shown. <a href="%s">Manage all users</a>.'), get_admin_url($id, 'users.php') ) . '</p>';
-} else {
-	_e('This site has no users.');
-}
-?>
 </form>
 
 <h3 id="add-new-user"><?php _e('Add Existing User') ?></h3>