diff --git a/web/html/account.php b/web/html/account.php
index 5c793be2..63c3ada4 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -12,9 +12,8 @@ html_header(__('Accounts'));
 
 # Main page processing here
 #
-echo "<div class=\"pgbox\">\n";
+echo "<div class=\"box\">\n";
 echo "  <h2>".__("Accounts")."</h2>\n";
-echo "  <div class=\"pgboxbody\">\n";
 
 $action = in_request("Action");
 
@@ -158,7 +157,6 @@ if (isset($_COOKIE["AURSID"])) {
 	}
 }
 
-echo "  </div>";
 echo "</div>";
 
 html_footer(AUR_VERSION);
diff --git a/web/template/search_accounts_form.php b/web/template/search_accounts_form.php
index 9b0d8e23..9e8c241f 100644
--- a/web/template/search_accounts_form.php
+++ b/web/template/search_accounts_form.php
@@ -1,74 +1,74 @@
 <br />
-<form action='account.php' method='post'>
+<form action="account.php" method="post">
 	<table>
 
 		<tr>
-			<td align='left'><?php print __("Username"); ?>:</td>
-			<td align='left'>
-				<input type='text' size='30' maxlength='64' name='U' />
+			<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'>
+			<td align="left"><?php print __("Account Type"); ?>:</td>
+			<td align="left">
 				<select name="T">
-					<option value=''><?php print __("Any type"); ?></option>
-					<option value='u'><?php print __("Normal user"); ?></option>
-					<option value='t'><?php print __("Trusted user"); ?></option>
-					<option value='d'><?php print __("Developer"); ?></option>
+					<option value=""><?php print __("Any type"); ?></option>
+					<option value="u"><?php print __("Normal user"); ?></option>
+					<option value="t"><?php print __("Trusted user"); ?></option>
+					<option value="d"><?php print __("Developer"); ?></option>
 				</select>
 			</td>
 		</tr>
 
 		<tr>
-			<td align='left'><?php print __("Account Suspended"); ?>:</td>
-			<td align='left'>
-				<input type='checkbox' name='S' />
+			<td align="left"><?php print __("Account Suspended"); ?>:</td>
+			<td align="left">
+				<input type="checkbox" name="S" />
 			</td>
 		</tr>
 
 		<tr>
-			<td align='left'><?php print __("Email Address"); ?>:</td>
-			<td align='left'>
-				<input type='text' size='30' maxlength='64' name='E' />
+			<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 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 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'>
+			<td align="left"><?php print __("Sort by"); ?>:</td>
+			<td align="left">
 				<select name="SB">
-					<option value='u'><?php print __("Username"); ?></option>
-					<option value='t'><?php print __("Account Type"); ?></option>
-					<option value='r'><?php print __("Real Name"); ?></option>
-					<option value='i'><?php print __("IRC Nick"); ?></option>
-					<option value='v'><?php print __("Last vote"); ?></option>
+					<option value="u"><?php print __("Username"); ?></option>
+					<option value="t"><?php print __("Account Type"); ?></option>
+					<option value="r"><?php print __("Real Name"); ?></option>
+					<option value="i"><?php print __("IRC Nick"); ?></option>
+					<option value="v"><?php print __("Last vote"); ?></option>
 				</select>
 			</td>
 		</tr>
 
 		<tr>
 			<td>&nbsp;</td>
-			<td align='left'>
+			<td align="left">
 				<br />
-				<input type='hidden' name='Action' value='SearchAccounts' />
-				<input type='submit' class='button' value="<?php print __("Search"); ?>" />
-				<input type='reset' class='button' value="<?php print __("Reset"); ?>" />
+				<input type="hidden" name="Action" value="SearchAccounts" />
+				<input type="submit" class="button" value="<?php print __("Search"); ?>" />
+				<input type="reset" class="button" value="<?php print __("Reset"); ?>" />
 			</td>
 		</tr>