diff --git a/web/lang/en/acctfuncs_po.inc b/web/lang/en/acctfuncs_po.inc
index 4af9cea4..3c054c10 100644
--- a/web/lang/en/acctfuncs_po.inc
+++ b/web/lang/en/acctfuncs_po.inc
@@ -89,4 +89,5 @@ $_t["en"]["Developer"] = "Developer";
 
 $_t["en"]["View this user's packages"] = "View this user's packages";
 
-?>
\ No newline at end of file
+?>
+
diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc
index 5de16dd5..ef8e774b 100644
--- a/web/lib/acctfuncs.inc
+++ b/web/lib/acctfuncs.inc
@@ -320,74 +320,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
 # search existing accounts
 #
 function search_accounts_form() {
-	print "<form action='/account.php' method='post'>\n";
-	print "<input type='hidden' name='Action' value='SearchAccounts'>\n";
-	print "<center>\n";
-	print "<table border='0' cellpadding='0' cellspacing='0' width='80%'>\n";
-	print "<tr><td colspan='2'>&nbsp;</td></tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Username").":</td>";
-	print "<td align='left'><input type='text' size='30' maxlength='64'";
-	print " name='U'></td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Account Type").":</td>";
-	print "<td align='left'><select name=T>\n";
-	print "<option value=''> ".__("Any type")."\n";
-	print "<option value='u'> ".__("Normal user")."\n";
-	print "<option value='t'> ".__("Trusted user")."\n";
-	print "<option value='d'> ".__("Developer")."\n";
-	print "</select></td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Account Suspended").":</td>";
-	print "<td align='left'><input type='checkbox' name='S'>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Email Address").":</td>";
-	print "<td align='left'><input type='text' size='30' maxlength='64'";
-	print " name='E'></td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Real Name").":</td>";
-	print "<td align='left'><input type='text' size='30' maxlength='32'";
-	print " name='R'></td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("IRC Nick").":</td>";
-	print "<td align='left'><input type='text' size='30' maxlength='32'";
-	print " name='I'></td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Sort by").":</td>";
-	print "<td align='left'><select name=SB>\n";
-	print "<option value='u'> ".__("Username")."\n";
-	print "<option value='t'> ".__("Account Type")."\n";
-	print "<option value='r'> ".__("Real Name")."\n";
-	print "<option value='i'> ".__("IRC Nick")."\n";
-	print "<option value='v'> ".__("Last vote")."\n";
-	print "</select></td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td>&nbsp;</td>";
-	print "<td align='left'>&nbsp;<br/>&nbsp;&nbsp;&nbsp;&nbsp;";
-	print "<input type='submit' class='button'";
-	print " value='".__("Search'")."> &nbsp; ";
-	print "<input type='reset' class='button'";
-	print "	value='".__("Reset")."'></td>";
-	print "</tr>\n";
-
-	print "</table>\n";
-	print "</center>\n";
-	print "</form>\n";
+	include("search_accounts_form.php");
 	return;
 }
 
diff --git a/web/template/search_accounts_form.php b/web/template/search_accounts_form.php
new file mode 100644
index 00000000..6e7d5526
--- /dev/null
+++ b/web/template/search_accounts_form.php
@@ -0,0 +1,68 @@
+<br />
+<form action='account.php' method='post'>
+<input type='hidden' name='Action' value='SearchAccounts'>
+<center>
+<table border='0' cellpadding='0' cellspacing='0' width='80%'>
+
+<tr>
+	<td align='left'><?php print __("Username"); ?>:</td>
+<td align='left'><input type='text' size='30' maxlength='64'
+ name='U'></td>
+</tr>
+
+<tr>
+<td align='left'><?php print __("Account Type"); ?>:</td>
+<td align='left'><select name=T>
+<option value=''><?php print __("Any type"); ?>
+<option value='u'><?php print __("Normal user"); ?>
+<option value='t'><?php print __("Trusted user"); ?>
+<option value='d'><?php print __("Developer"); ?>
+</select></td>
+</tr>
+
+<tr>
+<td align='left'><?php print __("Account Suspended"); ?>:</td>
+<td align='left'><input type='checkbox' name='S'>
+</tr>
+
+<tr>
+<td align='left'><?php print __("Email Address"); ?>:</td>
+<td align='left'><input type='text' size='30' maxlength='64'
+ name='E'></td>
+</tr>
+
+<tr>
+<td align='left'><?php print __("Real Name"); ?>:</td>
+<td align='left'><input type='text' size='30' maxlength='32'
+ name='R'></td>
+</tr>
+
+<tr>
+<td align='left'><?php print __("IRC Nick"); ?>:</td>
+<td align='left'><input type='text' size='30' maxlength='32'
+ name='I'></td>
+</tr>
+
+<tr>
+<td align='left'><?php print __("Sort by"); ?>:</td>
+<td align='left'><select name=SB>
+<option value='u'><?php print __("Username"); ?>
+<option value='t'><?php print __("Account Type"); ?>
+<option value='r'><?php print __("Real Name"); ?>
+<option value='i'><?php print __("IRC Nick"); ?>
+<option value='v'><?php print __("Last vote"); ?>
+</select></td>
+</tr>
+
+<tr>
+<td>&nbsp;</td>
+<td align='left'>&nbsp;<br/>
+<input type='submit' class='button'
+	value="<?php print __("Search'"); ?>">
+<input type='reset' class='button'
+	value="<?php print __("Reset"); ?>"></td>
+</tr>
+
+</table>
+</center>
+</form>