diff --git a/messages/uniworx/categories/jobs_handler/de-de-formal.msg b/messages/uniworx/categories/jobs_handler/de-de-formal.msg
index 7a63c78ff..8fd6899f6 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 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
+LinkActiveUntil time@Text: 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 f7df35617..be3093426 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 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
+LinkActiveUntil time@Text: The link is only available until #{time}!
\ No newline at end of file
diff --git a/src/Foundation/I18n.hs b/src/Foundation/I18n.hs
index e013060f5..0d7a31ee1 100644
--- a/src/Foundation/I18n.hs
+++ b/src/Foundation/I18n.hs
@@ -417,9 +417,6 @@ 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/src/Jobs/Handler/SendPasswordReset.hs b/src/Jobs/Handler/SendPasswordReset.hs
index 0832b4453..5e73b8949 100644
--- a/src/Jobs/Handler/SendPasswordReset.hs
+++ b/src/Jobs/Handler/SendPasswordReset.hs
@@ -34,7 +34,7 @@ dispatchJobSendPasswordReset jRecipient = JobHandlerException . userMailT jRecip
   let resetBearer = resetBearer'
         & bearerRestrict (UserPasswordR cID) (decodeUtf8 . Base64.encode . BA.convert $ computeUserAuthenticationDigest userAuthentication)
   encodedBearer <- encodeBearer resetBearer
-
+   
   resetUrl <- toTextUrl (UserPasswordR cID, [(toPathPiece GetBearer, toPathPiece encodedBearer)])
-
+  activeTime <- formatTimeMail SelFormatDateTime tomorrowEndOfDay
   addHtmlMarkdownAlternatives ($(ihamletFile "templates/mail/passwordReset.hamlet") :: HtmlUrlI18n (SomeMessage UniWorX) (Route UniWorX))
diff --git a/templates/mail/passwordReset.hamlet b/templates/mail/passwordReset.hamlet
index df7524f81..fa448db58 100644
--- a/templates/mail/passwordReset.hamlet
+++ b/templates/mail/passwordReset.hamlet
@@ -13,4 +13,4 @@ $newline never
     <h1>
       <a href=#{resetUrl}>
         _{SomeMessage MsgResetPassword}
-        _{SomeMessage $ MsgLinkActiveUntil tomorrowEndOfDay}
+        _{SomeMessage $ MsgLinkActiveUntil activeTime}