diff --git a/wp-admin/b2menutop.txt b/wp-admin/b2menutop.txt
index 6372660d9..09a864a97 100644
--- a/wp-admin/b2menutop.txt
+++ b/wp-admin/b2menutop.txt
@@ -1,10 +1,10 @@
 1	wp-post.php	Post
 1	edit.php	Edit
-3	b2team.php	Team
-4	wp-options.php	Options
 3	categories.php	Categories
+5	linkmanager.php	Links
+3	users.php	Users
+4	wp-options.php	Options
 4	b2template.php	Template
-5	linkmanager.php	Manage Links
 ***
 (Everything after the '***' is a comment.)
 
@@ -15,4 +15,4 @@ To add sections to the menu, use this syntax:
 +tab
 +the URL of the section's file
 +tab
-+the title of this section
++the title of this section
\ No newline at end of file
diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index d488d1aae..081bd8bc9 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -175,7 +175,7 @@ default:
 		
 		<p>Name:<br />
 		<input type="text" name="cat_name" value="" /></p>
-		<p>Description:<br />
+		<p>Description: (optional) <br />
 		<textarea name="category_description" rows="5" cols="50" style="width: 97%;"></textarea></p>
 		<p><input type="hidden" name="action" value="addcat" /><input type="submit" name="submit" value="Add" class="search" /></p>
 	</form>
diff --git a/wp-admin/users.php b/wp-admin/users.php
new file mode 100644
index 000000000..098bf2b6d
--- /dev/null
+++ b/wp-admin/users.php
@@ -0,0 +1,201 @@
+<?php
+$title = 'Team management';
+/* <Team> */
+	
+$b2varstoreset = array('action','standalone','redirect','profile');
+for ($i=0; $i<count($b2varstoreset); $i += 1) {
+	$b2var = $b2varstoreset[$i];
+	if (!isset($$b2var)) {
+		if (empty($HTTP_POST_VARS["$b2var"])) {
+			if (empty($HTTP_GET_VARS["$b2var"])) {
+				$$b2var = '';
+			} else {
+				$$b2var = $HTTP_GET_VARS["$b2var"];
+			}
+		} else {
+			$$b2var = $HTTP_POST_VARS["$b2var"];
+		}
+	}
+}
+
+switch ($action) {
+	
+case 'promote':
+
+	$standalone = 1;
+	require_once('b2header.php');
+
+	if (empty($HTTP_GET_VARS['prom'])) {
+		header('Location: users.php');
+	}
+
+	$id = $HTTP_GET_VARS['id'];
+	$prom = $HTTP_GET_VARS['prom'];
+
+	$user_data = get_userdata($id);
+	$usertopromote_level = $user_data->user_level;
+
+	if ($user_level <= $usertopromote_level) {
+		die('Can&#8217;t change the level of a user whose level is higher than yours.');
+	}
+
+	if ('up' == $prom) {
+		$sql="UPDATE $tableusers SET user_level=user_level+1 WHERE ID = $id";
+	} elseif ('down' == $prom) {
+		$sql="UPDATE $tableusers SET user_level=user_level-1 WHERE ID = $id";
+	}
+	$result = $wpdb->query($sql);
+
+	header('Location: users.php');
+
+break;
+
+case 'delete':
+
+	$standalone = 1;
+	require_once('b2header.php');
+
+	$id = $HTTP_GET_VARS['id'];
+
+	if (!$id) {
+		header('Location: users.php');
+	}
+
+	$user_data = get_userdata($id);
+	$usertodelete_level = $user_data->user_level;
+
+	if ($user_level <= $usertodelete_level)
+		die('Can&#8217;t delete a user whose level is higher than yours.');
+
+	$sql = "DELETE FROM $tableusers WHERE ID = $id";
+	$result = $wpdb->query($sql) or die("Couldn&#8217;t delete user #$id.");
+
+	$sql = "DELETE FROM $tableposts WHERE post_author = $id";
+	$result = $wpdb->query($sql) or die("Couldn&#8217;t delete user #$id&#8217;s posts.");
+
+	header('Location: users.php');
+
+break;
+
+default:
+	
+	$standalone = 0;
+	include ('b2header.php');
+	?>
+<div class="wrap">
+  <h2>Authors</h2>
+  <table cellpadding="5" cellspacing="0">
+	<tr>
+	<th>ID</th>
+	<th>Nickname</th>
+	<th>Name</th>
+	<th>E-mail</th>
+	<th>URL</th>
+	<th>Level</th>
+	<th>Posts</th>
+	</tr>
+	<?php
+	$users = $wpdb->get_results("SELECT ID FROM $tableusers WHERE user_level > 0 ORDER BY ID");
+	foreach ($users as $user) {
+		$user_data = get_userdata($user->ID);
+		$email = $user_data->user_email;
+		$url = $user_data->user_url;
+		$short_url = str_replace('http://', '', stripslashes($url));
+		$short_url = str_replace('www.', '', $short_url);
+		if ('/' == substr($short_url, -1))
+			$short_url = substr($short_url, 0, -1);
+		if (strlen($short_url) > 35)
+		$short_url =  substr($short_url, 0, 32).'...';
+		$bgcolor = ('#eee' == $bgcolor) ? 'none' : '#eee';
+		$numposts = $wpdb->get_var("SELECT COUNT(*) FROM $tableposts WHERE post_author = $user->ID and post_status = 'publish'");
+		if (0 < $numposts) $numposts = "<a href='edit.php?author=$user_data->ID' title='View posts'>$numposts</a>";
+		echo "
+<tr style='background-color: $bgcolor'>
+	<td>$user_data->ID</td>
+	<td><strong>$user_data->user_nickname</strong></td>
+	<td>$user_data->user_firstname $user_data->user_lastname</td>
+	<td><a href='mailto:$email' title='e-mail: $email'>$email</a></td>
+	<td><a href='$url' title='website: $url'>$short_url</a></td>
+	<td align='center'>";
+	if (($user_level >= 2) and ($user_level > $user_data->user_level) and ($user_data->user_level > 0))
+		echo " <a href=\"users.php?action=promote&id=".$user_data->ID."&prom=down\">-</a> ";
+	echo $user_data->user_level;
+	if (($user_level >= 2) and ($user_level > ($user_data->user_level + 1)))
+		echo " <a href=\"users.php?action=promote&id=".$user_data->ID."&prom=up\">+</a> ";
+	echo "<td align='right'>$numposts</td>";
+	echo '</tr>';
+	}
+	
+	?>
+	
+  </table>
+</div>
+
+<?php
+	$users = $wpdb->get_results("SELECT * FROM $tableusers WHERE user_level=0 ORDER BY ID");
+	if ($users) {
+?>
+<div class="wrap">
+	<h2>Users</h2>
+	<table cellpadding="5" cellspacing="0">
+	<tr>
+	<td>ID</td>
+	<td>Nickname</td>
+	<td>Name</td>
+	<td>E-mail</td>
+	<td>URL</td>
+	<td>Level</td>
+	<?php if ($user_level > 3) { ?>
+	<td>Login</td>
+	<?php } ?>
+	</tr>
+	<?php
+	foreach ($users as $user) {
+		$user_data = get_userdata($user->ID);
+		echo "<tr>\n<!--".$user_data->user_login."-->\n";
+		$email = $user_data->user_email;
+		$url = $user_data->user_url;
+		$bg1 = ($user_data->user_login == $user_login) ? "style=\"background-image: url('../b2-img/b2button.gif');\"" : "bgcolor=\"#dddddd\"";
+		$bg2 = ($user_data->user_login == $user_login) ? "style=\"background-image: url('../b2-img/b2button.gif');\"" : "bgcolor=\"#eeeeee\"";
+		echo "<td $bg1>".$user_data->ID."</td>\n";
+		echo "<td $bg2><b><a href=\"javascript:profile(".$user_data->ID.")\">".$user_data->user_nickname."</a></b></td>\n";
+		echo "<td $bg1>".$user_data->user_firstname."&nbsp;".$user_data->user_lastname."</td>\n";
+		echo "<td $bg1>&nbsp;<a href=\"mailto:".antispambot($email)."\" title=\"e-mail: ".antispambot($email)."\"><img src=\"../b2-img/email.gif\" border=\"0\" alt=\"e-mail: ".antispambot($email)."\" /></a>&nbsp;</td>";
+		echo "<td $bg2>&nbsp;";
+		if (($user_data->user_url != "http://") and ($user_data->user_url != ""))
+			echo "<a href=\"$url\" target=\"_blank\" title=\"website: $url\"><img src=\"../b2-img/url.gif\" border=\"0\" alt=\"website: $url\" /></a>&nbsp;";
+		echo "</td>\n";
+		echo "<td $bg1>".$user_data->user_level;
+		if ($user_level >= 2)
+			echo " <a href=\"users.php?action=promote&id=".$user_data->ID."&prom=up\">+</a> ";
+		if ($user_level >= 3)
+			echo " <a href=\"users.php?action=delete&id=".$user_data->ID."\" style=\"color:red;font-weight:bold;\">X</a> ";
+		echo "</td>\n";
+		if ($user_level > 3) {
+			echo "<td $bg2>".$user_data->user_login."</td>\n";
+		}
+		echo "</tr>\n";
+	}
+	
+	?>
+	
+	</table>
+	  <p>To delete a user, bring his level to zero, then click on the red X.<br />
+    <strong>Warning:</strong> deleting a user also deletes all posts made by this user. 
+  </p>
+</div>
+
+	<?php 
+	} ?>
+<div class="wrap">
+<h2>Add User</h2>
+<p>Users can <a href="<?php echo $siteurl ?>/wp-register.php">register themselves</a> or you can manually create users here.</p>
+</div>
+	<?php
+
+break;
+}
+	
+/* </Team> */
+include('b2footer.php');
+?>
\ No newline at end of file