diff --git a/src/Foundation.hs b/src/Foundation.hs
index 41d23fa65..1eebfd41c 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -2306,7 +2306,7 @@ instance YesodMail UniWorX where
   mailT ctx mail = defMailT ctx $ do
     void setMailObjectId
     setDateCurrent
-    replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (appMailFrom . appSettings)
+    replaceMailHeader "Sender" . Just =<< getsYesod (view $ _appMailFrom . _addressEmail)
 
     mail <* setMailSmtpData
 
diff --git a/src/Utils/Lens.hs b/src/Utils/Lens.hs
index b6a09e3c3..4493dc612 100644
--- a/src/Utils/Lens.hs
+++ b/src/Utils/Lens.hs
@@ -70,6 +70,8 @@ hasEntityUser = hasEntity
 --   hasUser = _entityVal . hasUser
 
 
+makeLenses_ ''Address
+
 makeLenses_ ''SheetCorrector
 
 makeLenses_ ''SubmissionGroup