diff --git a/admin/admin.html b/admin/admin.html
index b9913fc059b..8a2e575ada6 100644
--- a/admin/admin.html
+++ b/admin/admin.html
@@ -78,7 +78,7 @@
           ?>
          </select>
          <br />
-         <input type="text" name="searchtext" size="30" value="<?php echo $searchtext ?>" 
+         <input type="text" name="searchtext" size="30" value="<?php p($searchtext, true) ?>" 
                   onFocus ="document.adminform.add.disabled=true;
                             document.adminform.remove.disabled=true;
                             document.adminform.removeselect.selectedIndex=-1;
diff --git a/admin/admin.php b/admin/admin.php
index 68568dff480..eca279916f9 100644
--- a/admin/admin.php
+++ b/admin/admin.php
@@ -77,7 +77,7 @@
     }
 
 /// Is there a current search?
-    $previoussearch = (!empty($frm->search) or ($frm->previoussearch == 1)) ;
+    $previoussearch = (!empty($frm->search) or (isset($frm->previoussearch) and $frm->previoussearch == 1)) ;
 
 /// Get all existing admins
     $admins = get_admins();
diff --git a/admin/user.php b/admin/user.php
index 749d2358e0b..01814b820c7 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -333,7 +333,7 @@
 
         echo "<table class=\"searchbox\" align=\"center\" cellpadding=\"10\"><tr><td>";
         echo "<form action=\"user.php\" method=\"get\">";
-        echo "<input type=\"text\" name=\"search\" value=\"".s($search)."\" size=\"20\" />";
+        echo "<input type=\"text\" name=\"search\" value=\"".s($search, true)."\" size=\"20\" />";
         echo "<input type=\"submit\" value=\"$strsearch\" />";
         if ($search) {
             echo "<input type=\"button\" onclick=\"document.location='user.php';\" value=\"$strshowallusers\" />";