diff --git a/application/views/emails/password_reset.php b/application/views/emails/password_reset.php
index c6d1979..9d2a4e6 100644
--- a/application/views/emails/password_reset.php
+++ b/application/views/emails/password_reset.php
@@ -290,7 +290,7 @@ a[x-apple-data-detectors=true] {
 <div align="center" class="button-container center " style="padding-right: 10px; padding-left: 10px; padding-top:10px; padding-bottom:10px;">
   <!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0" style="border-spacing: 0; border-collapse: collapse; mso-table-lspace:0pt; mso-table-rspace:0pt;"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top:10px; padding-bottom:10px;" align="center"><v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="" style="height:31pt; v-text-anchor:middle; width:111pt;" arcsize="58%" strokecolor="#134C75" fillcolor="#134C75"><w:anchorlock/><v:textbox inset="0,0,0,0"><center style="color:#ffffff; font-family:'Open Sans', Helvetica, Arial, sans-serif; font-size:16px;"><![endif]-->
     <div style="color: #ffffff; background-color: #134C75; border-radius: 24px; -webkit-border-radius: 24px; -moz-border-radius: 24px; max-width: 148px; width: 88px;width: auto; border-top: 0px solid transparent; border-right: 0px solid transparent; border-bottom: 0px solid transparent; border-left: 0px solid transparent; padding-top: 5px; padding-right: 30px; padding-bottom: 5px; padding-left: 30px; font-family: 'Open Sans', Helvetica, Arial, sans-serif; text-align: center; mso-border-alt: none;">
-      <span style="font-family:'Open Sans', Helvetica, Arial, sans-serif;font-size:16px;line-height:32px;"><a href="<?= base_url('reset/' . $userHash . '/' . $resetKey) ?>" style="font-size: 14px;">PASSWORT ZURÜCKSETZEN</a></span>
+      <span style="font-family:'Open Sans', Helvetica, Arial, sans-serif;font-size:16px;line-height:32px;"><a href="<?= base_url('activate/' . $emailHash . '/' . $activationKey) ?>" style="font-size: 14px;">PASSWORT ZURÜCKSETZEN</a></span>
     </div>
   <!--[if mso]></center></v:textbox></v:roundrect></td></tr></table><![endif]-->
 </div>
@@ -300,7 +300,7 @@ a[x-apple-data-detectors=true] {
                     <div class="">
 	<!--[if mso]><table width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td style="padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px;"><![endif]-->
 	<div style="color:#fff;line-height:200%;font-family:'Open Sans', Helvetica, Arial, sans-serif; padding-right: 10px; padding-left: 10px; padding-top: 10px; padding-bottom: 10px;">
-		<div style="font-size:12px;line-height:24px;text-align:center;color:#fff;font-family:'Open Sans', Helvetica, Arial, sans-serif;"><p style="margin: 0;font-size: 12px;line-height: 24px;text-align: center">Sollte der Button nicht funktionieren, besuche folgenden Link:<br><a href="<?= base_url('reset/' . $userHash . '/' . $resetKey) ?>"><?= base_url('activate/' . $emailHash . '/' . $activationKey) ?></a></p></div>
+		<div style="font-size:12px;line-height:24px;text-align:center;color:#fff;font-family:'Open Sans', Helvetica, Arial, sans-serif;"><p style="margin: 0;font-size: 12px;line-height: 24px;text-align: center">Sollte der Button nicht funktionieren, besuche folgenden Link:<br><a href="<?= base_url('reset/' . urlencode($userHash) . '/' . $resetKey) ?>"><?= base_url('reset/' . urlencode($userHash) . '/' . $resetKey) ?></a></p></div>
 	</div>
 	<!--[if mso]></td></tr></table><![endif]-->
 </div>