diff --git a/articles/contact.md b/articles/contact.md
index 2bb0366..904ffba 100644
--- a/articles/contact.md
+++ b/articles/contact.md
@@ -9,11 +9,11 @@ If you have any questions or problems relating to our service, or this website,
     <option value="abuse">Abuse</option>
     <option value="support">Support</option>
     <option value="copyright">Copyright Problem</option></td></tr>
-    <tr><td>Type the word tildeverse here:</td> <td> <input type='textarea' name='tv'>
+    
 </select><br> </td></tr>
+<tr><td>Type the word tildeverse here:</td> <td> <input type='textarea' name='tv'></td></tr>
+<tr><td>Message:</td><td> <input type='textarea' name='message'><br><td>
 </table>
-Message: <input type='textarea' name='message'><br>
-
 <input type='submit'>
 </form>
 
diff --git a/articles/signup.md b/articles/signup.md
index c154100..928afa0 100644
--- a/articles/signup.md
+++ b/articles/signup.md
@@ -10,8 +10,9 @@ If you have any questions or problems, feel free to contact us.
 <tr><td>What interests you about thunix:</td> <td> <input type='textarea' name='interest'></td></tr>
 <tr><td>SSH Public Key:</td> <td> <input type='textarea' name='pubkey'></td></tr>
 <tr><td>Type the word tildeverse here:</td> <td> <input type='textarea' name='tv'></td></tr>
+</table>
 <input type='submit'>
-</table></form>
+</form>
 
 If you don't have a public SSH key, don't worry! Check out [this guide to SSH keys](https://tilde.team/wiki/?page=ssh) and make sure that you only fill in your public SSH key here.
 
diff --git a/includes/contact.php b/includes/contact.php
index 9248c1f..5867b1a 100644
--- a/includes/contact.php
+++ b/includes/contact.php
@@ -14,8 +14,8 @@ $mailbody         = "The following submission via the contact form was recieved:
 
 Real Name:      $name
 Email Address:  $email
-Type:           $interest
-Message:        $message";
+Type:           $subject
+Message:        $body";
 
 if ( $tv != "tildeverse" ) {
     print "Spam attempt";