diff --git a/messages/uniworx/categories/jobs_handler/de-de-formal.msg b/messages/uniworx/categories/jobs_handler/de-de-formal.msg
index 9486409fa..7a63c78ff 100644
--- a/messages/uniworx/categories/jobs_handler/de-de-formal.msg
+++ b/messages/uniworx/categories/jobs_handler/de-de-formal.msg
@@ -17,3 +17,4 @@ InvitationAcceptDecline: Einladung annehmen/ablehnen
 InvitationFromTip displayName@Text: Sie erhalten diese Einladung, weil #{displayName} ihren Versand in Uni2work ausgelöst hat.
 InvitationFromTipAnonymous: Sie erhalten diese Einladung, weil ein nicht eingeloggter Benutzer/eine nichteingeloggte Benutzerin ihren Versand in Uni2work ausgelöst hat.
 InvitationUniWorXTip: Uni2work ist ein webbasiertes Lehrverwaltungssystem der LMU München.
+LinkActiveUntil time@UTCTime: Der 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 6df1adf0c..f7df35617 100644
--- a/messages/uniworx/categories/jobs_handler/en-eu.msg
+++ b/messages/uniworx/categories/jobs_handler/en-eu.msg
@@ -17,3 +17,4 @@ InvitationAcceptDecline: Accept/Decline invitation
 InvitationFromTip displayName: You are receiving this invitation because #{displayName} has caused it to be sent from within Uni2work.
 InvitationFromTipAnonymous: You are receiving this invitiation because an user who didn't log in has caused it to be send from within Uni2work.
 InvitationUniWorXTip: Uni2work is a web based teaching management system at LMU Munich.
+LinkActiveUntil time@UTCTime: The link is only available until #{time}!
\ No newline at end of file
diff --git a/src/Application.hs b/src/Application.hs
index bcaf1edda..ab3bb8886 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -707,4 +707,4 @@ addPWEntry :: User
 addPWEntry User{ userAuthentication = _, ..} (Text.encodeUtf8 -> pw) = db' $ do
   PWHashConf{..} <- getsYesod $ view _appAuthPWHash
   (AuthPWHash . Text.decodeUtf8 -> userAuthentication) <- liftIO $ makePasswordWith pwHashAlgorithm pw pwHashStrength
-  void $ insert User{..}
+  void $ insert User{..}
\ No newline at end of file
diff --git a/src/Foundation/I18n.hs b/src/Foundation/I18n.hs
index b720355c6..e013060f5 100644
--- a/src/Foundation/I18n.hs
+++ b/src/Foundation/I18n.hs
@@ -417,6 +417,8 @@ instance ToMessage Natural where
   toMessage = tshow
 instance ToMessage Word64 where
   toMessage = tshow
+instance ToMessage UTCTime where
+  toMessage = tshow
 
 instance HasResolution a => ToMessage (Fixed a) where
   toMessage = toMessage . showFixed True
diff --git a/templates/mail/passwordReset.hamlet b/templates/mail/passwordReset.hamlet
index 2dd9dfc7b..df7524f81 100644
--- a/templates/mail/passwordReset.hamlet
+++ b/templates/mail/passwordReset.hamlet
@@ -13,3 +13,4 @@ $newline never
     <h1>
       <a href=#{resetUrl}>
         _{SomeMessage MsgResetPassword}
+        _{SomeMessage $ MsgLinkActiveUntil tomorrowEndOfDay}