diff --git a/messages/uniworx/categories/jobs_handler/de-de-formal.msg b/messages/uniworx/categories/jobs_handler/de-de-formal.msg
index 6fe682bdc..ddb653704 100644
--- a/messages/uniworx/categories/jobs_handler/de-de-formal.msg
+++ b/messages/uniworx/categories/jobs_handler/de-de-formal.msg
@@ -17,4 +17,4 @@ InvitationAcceptDecline: Einladung annehmen/ablehnen
 InvitationFromTip displayName@Text: Sie erhalten diese Einladung, weil #{displayName} ihren Versand in FRADrive ausgelöst hat.
 InvitationFromTipAnonymous: Sie erhalten diese Einladung, weil ein nicht eingeloggter Benutzer/eine nichteingeloggte Benutzerin ihren Versand in FRADrive ausgelöst hat.
 InvitationUniWorXTip: FRADrive ist ein webbasiertes Schulungsverwaltungssystem der Fraport AG.
-LinkActiveUntil time@Text: Der Link ist nur bis #{time} aktiv!
\ No newline at end of file
+LinkActiveUntil time@Text: Dieser Link ist nur bis #{time} aktiv!
\ No newline at end of file
diff --git a/messages/uniworx/categories/jobs_handler/en-eu.msg b/messages/uniworx/categories/jobs_handler/en-eu.msg
index 8b938cb01..d20350bba 100644
--- a/messages/uniworx/categories/jobs_handler/en-eu.msg
+++ b/messages/uniworx/categories/jobs_handler/en-eu.msg
@@ -17,4 +17,4 @@ InvitationAcceptDecline: Accept/Decline invitation
 InvitationFromTip displayName: You are receiving this invitation because #{displayName} has caused it to be sent from within FRADrive.
 InvitationFromTipAnonymous: You are receiving this invitiation because an user who didn't log in has caused it to be send from within FRADrive.
 InvitationUniWorXTip: FRADrive is a web based training management system at Fraport AG.
-LinkActiveUntil time@Text: The link is only active until #{time}!
\ No newline at end of file
+LinkActiveUntil time@Text: This link is only active until #{time}!
\ No newline at end of file
diff --git a/messages/uniworx/categories/send/send_notifications/de-de-formal.msg b/messages/uniworx/categories/send/send_notifications/de-de-formal.msg
index cb5f69e13..4596da948 100644
--- a/messages/uniworx/categories/send/send_notifications/de-de-formal.msg
+++ b/messages/uniworx/categories/send/send_notifications/de-de-formal.msg
@@ -131,7 +131,7 @@ UserAuthModeLDAPChangedToPWHash: Sie können sich nun mit einer FRADrive-interne
 AuthPWHashTip: Sie müssen nun das mit "FRADrive-Login" beschriftete Login-Formular verwenden. Stellen Sie bitte sicher, dass Sie ein Passwort gesetzt haben, bevor Sie versuchen sich anzumelden.
 PasswordResetEmailIncoming: Einen Link um ihr Passwort zu setzen bzw. zu ändern bekommen Sie, aus Sicherheitsgründen, in einer separaten E-Mail.
 MailFradrive !ident-ok: FRADrive
-MailBodyFradrive: die Führerscheinverwaltungsapp der Fraport AG.
+MailBodyFradrive: ist die Führerscheinverwaltungsapp der Fraport AG.
 
 #userRightsUpdate.hs + templates
 MailSubjectUserRightsUpdate name@Text: Berechtigungen für #{name} aktualisiert
diff --git a/messages/uniworx/categories/send/send_notifications/en-eu.msg b/messages/uniworx/categories/send/send_notifications/en-eu.msg
index 37aca5b64..788346b73 100644
--- a/messages/uniworx/categories/send/send_notifications/en-eu.msg
+++ b/messages/uniworx/categories/send/send_notifications/en-eu.msg
@@ -131,7 +131,7 @@ UserAuthModeLDAPChangedToPWHash: You can now log in using your FRADrive-internal
 AuthPWHashTip: You now need to use the login form labeled "FRADrive login". Please ensure that you have already set a password when you try to log in.
 PasswordResetEmailIncoming: For security reasons you will receive a link to the page on which you can set and later change your password in a separate email.
 MailFradrive: FRADrive
-MailBodyFradrive: the apron driving licence management app of Fraport AG.
+MailBodyFradrive: is the apron driving licence management app of Fraport AG.
 
 #userRightsUpdate.hs + templates
 MailSubjectUserRightsUpdate name: Permissions for #{name} changed
diff --git a/templates/mail/passwordReset.hamlet b/templates/mail/passwordReset.hamlet
index fa448db58..9f0453db4 100644
--- a/templates/mail/passwordReset.hamlet
+++ b/templates/mail/passwordReset.hamlet
@@ -13,4 +13,6 @@ $newline never
     <h1>
       <a href=#{resetUrl}>
         _{SomeMessage MsgResetPassword}
+    <p>
+      <a href=#{resetUrl}>
         _{SomeMessage $ MsgLinkActiveUntil activeTime}
diff --git a/templates/mail/userAuthModeUpdate.hamlet b/templates/mail/userAuthModeUpdate.hamlet
index 3ac3aeaf5..82c221b8b 100644
--- a/templates/mail/userAuthModeUpdate.hamlet
+++ b/templates/mail/userAuthModeUpdate.hamlet
@@ -21,7 +21,7 @@ $newline never
           _{SomeMessage MsgUserAuthModeLDAPChangedToPWHash}
     <p>
       <a href=@{NewsR}>
-        _{SomeMessage MsgMailFradrive}
+        _{SomeMessage MsgMailFradrive} #
       _{SomeMessage MsgMailBodyFradrive}
 
     $if is _AuthPWHash userAuthentication