diff --git a/src/Handler/Utils/Mail.hs b/src/Handler/Utils/Mail.hs
index bda5fe032..6a5e7be61 100644
--- a/src/Handler/Utils/Mail.hs
+++ b/src/Handler/Utils/Mail.hs
@@ -56,8 +56,8 @@ userAddressError :: (MonadHandler m, HandlerSite m ~ UniWorX) => User -> m (Bool
 userAddressError User{userEmail, userDisplayEmail, userDisplayName} 
   | Just okEmail <- pickValidEmail' userDisplayEmail userEmail = pure (True, Address (Just userDisplayName) $ CI.original okEmail)
   | otherwise = do
-      $logErrorS "Mail" $ "Attempt to email invalid address: " <> tshow userDisplayEmail <> " Sent to support instead." -- <> " with subject " <> tshow failedSubject
-      (True,) <$> getsYesod (view _appMailSupport)
+      $logErrorS "Mail" $ "Attempt to email invalid address: " <> tshow userDisplayEmail <> " / " <> tshow userEmail <> ". Sent to support instead." -- <> " with subject " <> tshow failedSubject
+      (False,) <$> getsYesod (view _appMailSupport)
 
 -- | Send an email to the given UserId or to all registered Supervisor with rerouteNotifications == True
 userMailT :: ( MonadHandler m
@@ -145,8 +145,9 @@ userMailTdirect uid mAct = do
     -- failedSubject <- lookupMailHeader "Subject"
     -- unless (validEmail $ addressEmail mailtoAddr) ($logErrorS "Mail" $ "Attempt to email invalid address: " <> tshow mailtoAddr <> " with subject " <> tshow failedSubject)
     _mailTo .= pure mailtoAddr
+    res <- mAct 
     unless mailOk $ mapSubject ("[ERROR]" <>)
-    mAct
+    pure res
 
 addFileDB :: ( MonadMail m
              , HandlerSite m ~ UniWorX
diff --git a/test/Database/Fill.hs b/test/Database/Fill.hs
index 5b2e03f84..183a051ae 100644
--- a/test/Database/Fill.hs
+++ b/test/Database/Fill.hs
@@ -437,12 +437,13 @@ fillDb = do
         userEmail' = CI.mk $ case firstName of           
           "James"     -> userIdent
           "John"      -> userIdent
-          --"Elizabeth" -> "AVSID:" <> userMatrikelnummer'
+          "Elizabeth" -> "AVSID:" <> userMatrikelnummer'
           _           ->      "E" <> userMatrikelnummer' <> "@fraport.de"
         userDisplayEmail' :: CI Text
         userDisplayEmail' = CI.mk $ case userSurname of 
           "Walker"    -> "AVSNO:" <> userMatrikelnummer'
           "Clark"     ->      "E" <> userMatrikelnummer' <> "@fraport.de"
+          "Elizabeth" -> ""
           _           -> userIdent
 
   matrikel <- toMatrikel <$> getRandomRs (0 :: Int, 9 :: Int)