diff --git a/backend/src/middleware/email/templates/signup.html b/backend/src/middleware/email/templates/signup.html
index 3a3f2760d..a04fa0e87 100644
--- a/backend/src/middleware/email/templates/signup.html
+++ b/backend/src/middleware/email/templates/signup.html
@@ -156,7 +156,7 @@
 
     .button-td-primary:hover,
     .button-a-primary:hover {
-      background: #555555 !important;
+      background: #19c243 !important;
       border-color: #555555 !important;
     }
 
@@ -216,7 +216,7 @@
             <img
               src="https://firebasestorage.googleapis.com/v0/b/gitbook-28427.appspot.com/o/assets%2F-LcGvGRsW6DrZn7FWRzF%2F-LcGv6EiVcsjYLfQ_2YE%2F-LcGv8UtmAWc61fxGveg%2Flets_get_together.png?generation=1555078880410873&alt=media"
               width="600" height="" alt="Human Connection community logo" border="0"
-              style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 15px; line-height: 15px; color: #555555; margin: auto; display: block;"
+              style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
               class="g-img">
           </td>
         </tr>
@@ -228,13 +228,13 @@
             <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
               <tr>
                 <td
-                  style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
+                  style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
                   <h1
                     style="margin: 0 0 10px 0; font-family: Lato, sans-serif; font-size: 25px; line-height: 30px; color: #333333; font-weight: normal;">
                     Welcome to Human Connection!</h1>
                   <p style="margin: 0;">Thank you for joining our cause – it's awesome to have you on board. There's
-                    just one tiny step missing before we can start shaping the world together: Please confirm your
-                    e-mail address by clicking the button below!</p>
+                    just one tiny step missing before we can start shaping the world together... Please confirm your
+                    e-mail address by clicking the button below:</p>
                 </td>
               </tr>
               <tr>
@@ -244,8 +244,8 @@
                     style="margin: auto;">
                     <tr>
                       <td class="button-td button-td-primary" style="border-radius: 4px; background: #17b53e;">
-                        <a class="button-a button-a-primary" href="https://google.com/"
-                          style="background: #17b53e; font-family: Lato, sans-serif; font-size: 15px; line-height: 15px; text-decoration: none; padding: 13px 17px; color: #ffffff; display: block; border-radius: 4px;">Confirm
+                        <a class="button-a button-a-primary" href="{{{ actionUrl }}}"
+                          style="background: #17b53e; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; text-decoration: none; padding: 13px 17px; color: #ffffff; display: block; border-radius: 4px;">Confirm
                           your email address</a>
                       </td>
                     </tr>
@@ -255,58 +255,53 @@
               </tr>
               <tr>
                 <td
-                  style="padding: 20px; font-family: Lato, sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
-                  <p style="margin: 0;">Or you can copy this code and paste it in your browser window:</p>
+                  style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
+                  <p style="margin: 0;">Or you can copy this code and paste it in your browser window: <span
+                      style="color: #17b53e;">{{{ nonce }}}</span></p>
                 </td>
               </tr>
+              <tr>
+                <td style="text-align: center; color :#17b53e">–––––––––––––––––––––––––––––––––––––––––––––––</td>
+              </tr>
             </table>
           </td>
         </tr>
         <!-- 1 Column Text + Button : END -->
 
-        <!-- Clear Spacer : BEGIN -->
-        <tr>
-          <td aria-hidden="true" height="20" style="font-size: 0px; line-height: 0px;">
-            &nbsp;
-          </td>
-        </tr>
-        <!-- Clear Spacer : END -->
-
         <!-- 1 Column Text : BEGIN -->
         <tr>
           <td style="background-color: #ffffff;">
             <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
               <tr>
                 <td
-                  style="padding: 20px; font-family: Lato, sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
-                  <p style="margin: 0;">If you didn't sign up for Human Connection we recommend you to check it out!
+                  style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
+                  <p style="margin: 0;">If you didn't sign up for <a href="https://human-connection.org"
+                      style="color: #17b53e;">Human Connection</a> we recommend you to check it out!
                     It's an online platform for people to connect and change the world together.</p>
                   <p style="margin: 0; margin-top: 10px;">PS: If you ignore this email we will not create an account for
                     you. ;)</p>
                 </td>
               </tr>
+              <tr>
+                <td style="text-align: center; color :#17b53e">–––––––––––––––––––––––––––––––––––––––––––––––</td>
+              </tr>
             </table>
           </td>
         </tr>
         <!-- 1 Column Text : END -->
 
-        <!-- Clear Spacer : BEGIN -->
-        <tr>
-          <td aria-hidden="true" height="20" style="font-size: 0px; line-height: 0px;">
-            &nbsp;
-          </td>
-        </tr>
-        <!-- Clear Spacer : END -->
-
         <!-- 1 Column Text : BEGIN -->
         <tr>
           <td style="background-color: #ffffff;">
             <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
               <tr>
                 <td
-                  style="padding: 20px; font-family: Lato, sans-serif; font-size: 15px; line-height: 20px; color: #555555;">
-                  <p style="margin: 0;">Feel free to contact our support team with any questions you might have.</p>
-                  <p style="margin: 0; margin-top: 10px;">Thank you, and see you soon on Human Connection!</p>
+                  style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
+                  <p style="margin: 0;">Feel free to <a href="{{{ supportUrl }}}" style="color: #17b53e;">contact our
+                      support team</a> with any
+                    questions you might have.</p>
+                  <p style="margin: 0; margin-top: 10px;">See you soon on <a href="https://human-connection.org"
+                      style="color: #17b53e;">Human Connection</a>!</p>
                   <p style="margin: 0;">– The Human Connection Team</p>
                 </td>
               </tr>
@@ -325,7 +320,7 @@
           <td
             style="padding: 20px; font-family: Lato, sans-serif; font-size: 12px; line-height: 15px; text-align: center; color: #888888;">
             <br><br>
-            Human Connection gGmbH<br><span class="unstyle-auto-detected-links">Bahnhofstraße 11<br>73235 Weilheim /
+            Human Connection gGmbH<br><span class="unstyle-auto-detected-links">Bahnhofstraße 11, 73235 Weilheim /
               Teck<br>Germany</span>
             <br><br>
           </td>