diff --git a/webtools/litmus/edit_users.cgi b/webtools/litmus/edit_users.cgi
index 8f024a03c9e3..123080eae3bb 100755
--- a/webtools/litmus/edit_users.cgi
+++ b/webtools/litmus/edit_users.cgi
@@ -49,12 +49,13 @@ if (Litmus::Auth::istrusted($cookie)) {
   
   if ($c->param('search_string')) {
     # search for users:
-    my $users = Litmus::DB::User->search_FullTextMatches(
+    my @users = Litmus::DB::User->search_FullTextMatches(
                                                          $c->param('search_string'), 
                                                          $c->param('search_string'),
                                                          $c->param('search_string'));
     my $vars = {
-		users => $users,
+		users => \@users,
+                search_string => $c->param('search_string'),
                };
     print $c->header();
     Litmus->template()->process("admin/edit_users/search_results.html.tmpl", $vars) || 
diff --git a/webtools/litmus/templates/en/default/admin/edit_users/search_results.html.tmpl b/webtools/litmus/templates/en/default/admin/edit_users/search_results.html.tmpl
index 1b486ddefd5c..dfb55e8980a9 100755
--- a/webtools/litmus/templates/en/default/admin/edit_users/search_results.html.tmpl
+++ b/webtools/litmus/templates/en/default/admin/edit_users/search_results.html.tmpl
@@ -42,38 +42,43 @@
 <tr>
   <td class="header"></td>
   <td class="header">Email Address</td>
-  <td class="header">irc</td>
+  <td class="header">IRC Nickname</td>
   <td class="header">Name</td>
 </tr>
 
-[% resultsfound = 0 %]
-[% WHILE (u = users.next) %] 
-  [% resultsfound = 1 %]
-  <tr>
+[% IF users %]
+
+[% FOREACH user=users.list %]
+  <tr [% IF not (loop.count % 2) %]class="even"[% ELSE %]class="odd"[% END %]>
     <td>
-    <a href="edit_users.cgi?id=[%u.user_id | html | uri %]">edit</a>
+    <a href="edit_users.cgi?id=[% user.user_id | html | uri %]">edit</a>
     </td>
     <td>
-      [% u.email | html %]
+      [% user.email | html %]
     </td>
     <td>
-      [% u.irc_nickname | html %]
+      [% user.irc_nickname | html %]
     </td>
     <td>
-      [% u.realname | html %]
+      [% user.realname | html %]
     </td>
   </tr>
 [% END %]
+
 </table>
 
-[% IF resultsfound == 0 %]
-  <h1 class="errorHeading">No results found.</h1>
-  
-  [% INCLUDE admin/edit_users/searchform.html.tmpl %]
+[% ELSE %]
+<tr>
+  <td class="no-results" colspan="4">No matching users found.</td>
+</tr>
+
 [% END %]
 
-</div>
+</table>
+  
+[% INCLUDE admin/edit_users/searchform.html.tmpl %]
 
+</div>
 
 </div><!--END content-->
 
diff --git a/webtools/litmus/templates/en/default/admin/edit_users/searchform.html.tmpl b/webtools/litmus/templates/en/default/admin/edit_users/searchform.html.tmpl
index 8733aa8129f7..061146b577d3 100755
--- a/webtools/litmus/templates/en/default/admin/edit_users/searchform.html.tmpl
+++ b/webtools/litmus/templates/en/default/admin/edit_users/searchform.html.tmpl
@@ -26,7 +26,7 @@
 
 <form action="edit_users.cgi" method="get" name="form" id="form">
 List users matching 
-<input name="search_string" size="35" value="[% user.email %]"/>
+<input name="search_string" size="35" value="[% IF search_string %][% search_string | html %][% ELSE %][% user.email %][% END %]"/>
 <input type="submit" name="submit" value="Search" />
 </form>