diff --git a/threadr/signup/index.php b/threadr/signup/index.php
index 73aa6b8..2016e0e 100644
--- a/threadr/signup/index.php
+++ b/threadr/signup/index.php
@@ -23,10 +23,10 @@
       <div class="item-2 round-border">
         <p>Sign Up:</p>
         <form action="%CONTENT_DIR%/signup/verify-email/" method="post">
-          <p>Benutzername: <input type="text" name="username" placeholder=Username"/> </p>
-          <p>E-Mail: <input type="text" name="email" placeholder="email@example.com"/> </p>
-          <p>Passwort: <input type="password" name="password" placeholder="Password"/> </p>
-          <p>Passwort best&auml;tigen: <input type="password" name="password_confirm" placeholder="Confirm password"/> </p>
+          <p>Benutzername: <input type="text" name="username" placeholder="Username" /> </p>
+          <p>E-Mail: <input type="text" name="email" placeholder="email@example.com" /> </p>
+          <p>Passwort: <input type="password" name="password" placeholder="Password" /> </p>
+          <p>Passwort best&auml;tigen: <input type="password" name="password_confirm" placeholder="Confirm password" /> </p>
           <input type="submit" value="Register" />
         </form>
         <p></p>
diff --git a/threadr/signup/verify-email/index.php b/threadr/signup/verify-email/index.php
index 81d979b..5d69f84 100644
--- a/threadr/signup/verify-email/index.php
+++ b/threadr/signup/verify-email/index.php
@@ -13,9 +13,15 @@
     return $random_string;
   }
 
-  $random_salt = generate_salt($permitted_chars);
+  //for password hashing
+  $password_salt = generate_salt($permitted_chars);
   $password_hash_method = "sha256";
 
+  //for token generation
+  $token_salt = generate_salt($permitted_chars);
+  $token_hashes = hash("crc32", $_POST['email']) . hash("crc32", $_POST['username']);
+  $token = str_shuffle($token_hashes . $token_salt);
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -51,11 +57,9 @@
             </h1>
           </div>
           <div class="item-2 round-border">
-            <p>Bitte senden sie eine E-Mail mit folgendem Inhalt an <a href="mailto:signup@lostcave.ddnss.de?subject=signup&body=%TOKEN%">signup@lostcave.ddnss.de</a>:</p>
-            <a href="mailto:signup@lostcave.ddnss.de?subject=signup&body=%TOKEN%">signup@lostcave.ddnss.de</a>
+            <p>Bitte senden sie eine E-Mail mit folgendem Inhalt an <a href="mailto:signup@lostcave.ddnss.de?subject=signup&body=<?php echo $token; ?>">signup@lostcave.ddnss.de</a>:</p>
             <form action="%CONTENT_DIR%/signup/verify-email/redirect.php" method="post">
-              <!-- TODO: add token generator -->
-              <p>%TOKEN%</p>
+              <p><?php echo $token; ?></p>
               <input type="submit" value="Weiter" />
           </div>
         </div>
