diff --git a/includes/contact.php b/includes/contact.php
index cf609e2..9248c1f 100644
--- a/includes/contact.php
+++ b/includes/contact.php
@@ -19,16 +19,16 @@ Message:        $message";
 
 if ( $tv != "tildeverse" ) {
     print "Spam attempt";
-    header("Location: $site_root/success1");
+    header("Location: $site_root/?page=success1");
     die();
 }
 
-shell_exec("echo $mailbody | /usr/bin/mail -s 'New User Registration' $destination_addr ");
+shell_exec("echo '$mailbody' | /usr/bin/mail -s 'New User Registration' $destination_addr ");
 
 // In the future, here, we *should* be able to build a process that 
 // somehow auto-verifies the user, and instead of email, it'll kick off the new user process here
 
-header("Location: $site_root/success2");
+header("Location: $site_root/?page=success2");
 die()
 
 ?>
\ No newline at end of file
diff --git a/includes/signup.php b/includes/signup.php
index 36365d3..d723efd 100644
--- a/includes/signup.php
+++ b/includes/signup.php
@@ -19,16 +19,16 @@ Pubkey:         $pubkey";
 
 if ( $tv != "tildeverse" ) {
     print "Spam attempt";
-    header("Location: $site_root/success1");
+    header("Location: $site_root/?page=success1");
     die();
 }
 
-shell_exec("echo $mailbody | /usr/bin/mail -s 'New User Registration' $destination_addr ");
+shell_exec("echo '$mailbody' | /usr/bin/mail -s 'New User Registration' $destination_addr ");
 
 // In the future, here, we *should* be able to build a process that 
 // somehow auto-verifies the user, and instead of email, it'll kick off the new user process here
 
-header("Location: $site_root/success2");
+header("Location: $site_root/?page=success2");
 
 die();