diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 9dd889f528..716b20d7fd 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1227,18 +1227,28 @@ function user_row( $user_object, $style = '', $role = '' ) {
 	$numposts = get_usernumposts( $user_object->ID );
 	if ( current_user_can( 'edit_user', $user_object->ID ) ) {
 		if ($current_user->ID == $user_object->ID) {
-			$edit = 'profile.php';
+			$edit_link = 'profile.php';
 		} else {
-			$edit = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ) );
+			$edit_link = clean_url( add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" ) );
+		}
+		$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
+		$actions = array();
+		$actions['edit'] = '<a href="' . $edit_link . '">' . __('Edit') . '</a>';
+		$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users') . "' onclick=\"if ( confirm('" . js_escape(sprintf(__("You are about to delete this user '%s'\n  'Cancel' to stop, 'OK' to delete."), $user_object->user_login )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>";
+		$action_count = count($actions);
+		$i = 0;
+		foreach ( $actions as $action => $link ) {
+			++$i;
+			( $i == $action_count ) ? $sep = '' : $sep = ' | ';
+			$edit .= "<span class='$action'>$link$sep</span>";
 		}
-		$edit = "<a href=\"$edit\">$user_object->user_login</a>";
 	} else {
-		$edit = $user_object->user_login;
+		$edit = '<strong>' . $user_object->user_login . '</strong>';
 	}
 	$role_name = isset($wp_roles->role_names[$role]) ? translate_with_context($wp_roles->role_names[$role]) : __('None');
 	$r = "<tr id='user-$user_object->ID'$style>
 		<th scope='row' class='check-column'><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /></th>
-		<td><strong>$edit</strong></td>
+		<td>$edit</td>
 		<td>$user_object->first_name $user_object->last_name</td>
 		<td><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>
 		<td>$role_name</td>";
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 67bd4ab889..110e8de6f2 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -114,7 +114,7 @@ case 'delete':
 
 	check_admin_referer('bulk-users');
 
-	if ( empty($_REQUEST['users']) ) {
+	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
 		wp_redirect($redirect);
 		exit();
 	}
@@ -122,7 +122,10 @@ case 'delete':
 	if ( !current_user_can('delete_users') )
 		$errors = new WP_Error('edit_users', __('You can&#8217;t delete users.'));
 
-	$userids = $_REQUEST['users'];
+	if ( empty($_REQUEST['users']) )
+		$userids = array(intval($_REQUEST['user']));
+	else
+		$userids = $_REQUEST['users'];
 
 	include ('admin-header.php');
 ?>