diff --git a/pages/account/40.php b/pages/account/40.php
index 15f69da..8a72c9f 100644
--- a/pages/account/40.php
+++ b/pages/account/40.php
@@ -21,15 +21,17 @@
 <p><?=_("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p>
 <p><a href="http://lists.cacert.org/cgi-bin/mailman/listinfo/cacert-support"><?=_("Click here to go to the Support List")?></a></p>
 <p><?=_("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p>
-<p><form method="post" action="<?=$_SERVER['PHP_SELF']?>">
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="hidden" name="support" value="yes">
-<?=_("Your Name")?>: <input type="text" name="who"><br>
-<?=_("Your Email")?>: <input type="text" name="email"><br>
-<?=_("Subject")?>: <input type="text" name="subject"><br>
-<textarea name="message" cols="40" rows="10"></textarea><br>
-<input type="submit" name="process" value="<?=_("Send")?>">
-</form></p>
+<form method="post" action="<?=$_SERVER['PHP_SELF']?>">
+  <input type="hidden" name="oldid" value="<?=$id?>">
+  <input type="hidden" name="support" value="yes">
+  <table border="0">
+    <tr><td><?=_("Your Name")?>:</td><td><input type="text" name="who"></td></tr>
+    <tr><td><?=_("Your Email")?>:</td><td><input type="text" name="email"></td></tr>
+    <tr><td><?=_("Subject")?>:</td><td><input type="text" name="subject"></td></tr>
+    <tr><td colspan="2"><textarea name="message" cols="40" rows="10"></textarea></td></tr>
+    <tr><td colspan="2"><input type="submit" name="process" value="<?=_("Send")?>"></td></tr>
+  </table>
+</form>
 
 <p><b>IRC</b></p>
 <p><a href="irc://irc.CAcert.org/CAcert">irc://irc.CAcert.org/CAcert</a></p>
@@ -42,14 +44,16 @@
 
 <p><b><?=_("Sensitive Information")?></b></p>
 <p><?=_("If you have questions, comments or otherwise and information you're sending to us contains sensitive details, you should use the contact form below. Due to the large amounts of support emails we receive, sending general questions via this contact form will generally take longer then using the support mailing list. Also sending queries in anything but english could cause delays in supporting you as we'd need to find a translator to help.")?></p>
-<p><form method="post" action="<?=$_SERVER['PHP_SELF']?>">
-<input type="hidden" name="oldid" value="<?=$id?>">
-<?=_("Your Name")?>: <input type="text" name="who"><br>
-<?=_("Your Email")?>: <input type="text" name="email"><br>
-<?=_("Subject")?>: <input type="text" name="subject"><br>
-<textarea name="message" cols="40" rows="10"></textarea><br>
-<input type="submit" name="process" value="<?=_("Send")?>">
-</form></p>
+<form method="post" action="<?=$_SERVER['PHP_SELF']?>">
+  <input type="hidden" name="oldid" value="<?=$id?>">
+  <table border="0">
+    <tr><td><?=_("Your Name")?>:</td><td><input type="text" name="who"></td></tr>
+    <tr><td><?=_("Your Email")?>:</td><td><input type="text" name="email"></td></tr>
+    <tr><td><?=_("Subject")?>:</td><td><input type="text" name="subject"></td></tr>
+    <tr><td colspan="2"><textarea name="message" cols="40" rows="10"></textarea></td></tr>
+    <tr><td colspan="2"><input type="submit" name="process" value="<?=_("Send")?>"></td></tr>
+  </table>
+</form>
 
 <p><b><?=_("Snail Mail")?></b></p>
 <p><?=_("Alternatively you can get in contact with us via the following methods:")?></p>
diff --git a/pages/index/11.php b/pages/index/11.php
index 15f69da..8a72c9f 100644
--- a/pages/index/11.php
+++ b/pages/index/11.php
@@ -21,15 +21,17 @@
 <p><?=_("General questions about CAcert should be sent to the general support list, please send all emails in ENGLISH only, this list has many more volunteers then those directly involved with the running of the website, everyone on the mailing list understands english, even if this isn't their native language this will increase your chance at a competent reply. While it's best if you sign up to the mailing list to get replied to, you don't have to, but please make sure you note this in your email, otherwise it might seem like you didn't get a reply to your question.")?></p>
 <p><a href="http://lists.cacert.org/cgi-bin/mailman/listinfo/cacert-support"><?=_("Click here to go to the Support List")?></a></p>
 <p><?=_("You can alternatively use the form below, however joining the list is the prefered option to support your queries")?></p>
-<p><form method="post" action="<?=$_SERVER['PHP_SELF']?>">
-<input type="hidden" name="oldid" value="<?=$id?>">
-<input type="hidden" name="support" value="yes">
-<?=_("Your Name")?>: <input type="text" name="who"><br>
-<?=_("Your Email")?>: <input type="text" name="email"><br>
-<?=_("Subject")?>: <input type="text" name="subject"><br>
-<textarea name="message" cols="40" rows="10"></textarea><br>
-<input type="submit" name="process" value="<?=_("Send")?>">
-</form></p>
+<form method="post" action="<?=$_SERVER['PHP_SELF']?>">
+  <input type="hidden" name="oldid" value="<?=$id?>">
+  <input type="hidden" name="support" value="yes">
+  <table border="0">
+    <tr><td><?=_("Your Name")?>:</td><td><input type="text" name="who"></td></tr>
+    <tr><td><?=_("Your Email")?>:</td><td><input type="text" name="email"></td></tr>
+    <tr><td><?=_("Subject")?>:</td><td><input type="text" name="subject"></td></tr>
+    <tr><td colspan="2"><textarea name="message" cols="40" rows="10"></textarea></td></tr>
+    <tr><td colspan="2"><input type="submit" name="process" value="<?=_("Send")?>"></td></tr>
+  </table>
+</form>
 
 <p><b>IRC</b></p>
 <p><a href="irc://irc.CAcert.org/CAcert">irc://irc.CAcert.org/CAcert</a></p>
@@ -42,14 +44,16 @@
 
 <p><b><?=_("Sensitive Information")?></b></p>
 <p><?=_("If you have questions, comments or otherwise and information you're sending to us contains sensitive details, you should use the contact form below. Due to the large amounts of support emails we receive, sending general questions via this contact form will generally take longer then using the support mailing list. Also sending queries in anything but english could cause delays in supporting you as we'd need to find a translator to help.")?></p>
-<p><form method="post" action="<?=$_SERVER['PHP_SELF']?>">
-<input type="hidden" name="oldid" value="<?=$id?>">
-<?=_("Your Name")?>: <input type="text" name="who"><br>
-<?=_("Your Email")?>: <input type="text" name="email"><br>
-<?=_("Subject")?>: <input type="text" name="subject"><br>
-<textarea name="message" cols="40" rows="10"></textarea><br>
-<input type="submit" name="process" value="<?=_("Send")?>">
-</form></p>
+<form method="post" action="<?=$_SERVER['PHP_SELF']?>">
+  <input type="hidden" name="oldid" value="<?=$id?>">
+  <table border="0">
+    <tr><td><?=_("Your Name")?>:</td><td><input type="text" name="who"></td></tr>
+    <tr><td><?=_("Your Email")?>:</td><td><input type="text" name="email"></td></tr>
+    <tr><td><?=_("Subject")?>:</td><td><input type="text" name="subject"></td></tr>
+    <tr><td colspan="2"><textarea name="message" cols="40" rows="10"></textarea></td></tr>
+    <tr><td colspan="2"><input type="submit" name="process" value="<?=_("Send")?>"></td></tr>
+  </table>
+</form>
 
 <p><b><?=_("Snail Mail")?></b></p>
 <p><?=_("Alternatively you can get in contact with us via the following methods:")?></p>