diff --git a/admin/admin_user_search.php b/admin/admin_user_search.php
index ac72ef1e1..fcd149594 100644
--- a/admin/admin_user_search.php
+++ b/admin/admin_user_search.php
@@ -100,6 +100,7 @@ if (!isset($_REQUEST['dosearch'])) {
         'FORUMS_LIST' => $forums_list,
         'LASTVISITED_LIST' => $lastvisited_list,
 
+        'U_SEARCH_USER' => BB_ROOT . 'search.php?mode=searchuser',
         'S_SEARCH_ACTION' => 'admin_user_search.php',
     ));
 } else {
diff --git a/styles/templates/admin/admin_ranks.tpl b/styles/templates/admin/admin_ranks.tpl
index e278137c5..884024270 100644
--- a/styles/templates/admin/admin_ranks.tpl
+++ b/styles/templates/admin/admin_ranks.tpl
@@ -65,8 +65,7 @@
 <tr>
 	<th>{L_RANK_TITLE}</th>
 	<th>{L_RANK_IMAGE}</th>
-	<th>{L_EDIT}</th>
-	<th>{L_DELETE}</th>
+  <th colspan="2">{L_ACTION}</th>
 </tr>
 <!-- BEGIN ranks -->
 <tr class="{ranks.ROW_CLASS} tCenter">
diff --git a/styles/templates/admin/admin_user_ban.tpl b/styles/templates/admin/admin_user_ban.tpl
index 9a86bd10c..34c475d08 100644
--- a/styles/templates/admin/admin_user_ban.tpl
+++ b/styles/templates/admin/admin_user_ban.tpl
@@ -11,7 +11,7 @@
 	</tr>
 	<tr>
 		<td class="row1">{L_USERNAME}:</td>
-		<td class="row2"><input class="post" type="text" class="post" name="username" maxlength="50" size="20" /> <input type="hidden" name="mode" value="edit" />{S_HIDDEN_FIELDS} <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_bbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td>
+		<td class="row2"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="hidden" name="mode" value="edit" />{S_HIDDEN_FIELDS} <input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" class="liteoption" onClick="window.open('{U_SEARCH_USER}', '_bbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" /></td>
 	</tr>
 	<tr>
 		<th colspan="2">{L_UNBAN_USERNAME}</th>
diff --git a/styles/templates/admin/admin_user_search.tpl b/styles/templates/admin/admin_user_search.tpl
index 40db38840..f4cbe822f 100644
--- a/styles/templates/admin/admin_user_search.tpl
+++ b/styles/templates/admin/admin_user_search.tpl
@@ -13,7 +13,7 @@
 		<th>{L_SEARCH_USERS_ADVANCED}</th>
 	</tr>
 	<tr>
-		<td class="row1"><span class="gen"><b>{L_USERNAME}:</b>&nbsp;<input class="post" type="text" name="username" maxlength="255" size="25" />&nbsp;<input type="submit" class="post2" name="search_username" value="{L_SEARCH}" /></span><br /><span class="small">{L_SEARCH_USERNAME_EXPLAIN}</span></td>
+		<td class="row1"><span class="gen"><b>{L_USERNAME}:</b>&nbsp;<input class="post" type="text" name="username" maxlength="255" size="25" />&nbsp;<input type="submit" name="usersubmit" value="{L_FIND_USERNAME}" onclick="window.open('{U_SEARCH_USER}', '_bbsearch', 'HEIGHT=250,resizable=yes,WIDTH=400');return false;" />&nbsp;<input type="submit" class="post2" name="search_username" value="{L_SEARCH}" /></span><br /><span class="small">{L_SEARCH_USERNAME_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 		<td class="row2">&nbsp;</td>
@@ -91,7 +91,7 @@
 	</tr>
 	<!-- END forums_exist -->
 	<tr>
-		<td class="row1"><span class="gen"><select name="misc" class="post"><option value="admins" selected="selected">{L_ADMINISTRATORS}</option><option value="mods">{L_MODERATORS}</option><option value="banned">{L_BANNED_USERS}</option><option value="disabled">{L_DISABLED_USERS}</option></select>&nbsp;<input type="submit" class="post2" class="post2" name="search_misc" value="{L_SEARCH}" /></span><br /><span class="small">{L_SEARCH_USERS_MISC_EXPLAIN}</span></td>
+		<td class="row1"><span class="gen"><select name="misc" class="post"><option value="admins" selected="selected">{L_ADMINISTRATORS}</option><option value="mods">{L_MODERATORS}</option><option value="banned">{L_BANNED_USERS}</option><option value="disabled">{L_DISABLED_USERS}</option></select>&nbsp;<input type="submit" class="post2" name="search_misc" value="{L_SEARCH}" /></span><br /><span class="small">{L_SEARCH_USERS_MISC_EXPLAIN}</span></td>
 	</tr>
 	<tr>
 		<td class="row2">&nbsp;</td>