diff --git a/src/Foundation/Yesod/Auth.hs b/src/Foundation/Yesod/Auth.hs
index 72f9cda84..27a72425b 100644
--- a/src/Foundation/Yesod/Auth.hs
+++ b/src/Foundation/Yesod/Auth.hs
@@ -320,7 +320,7 @@ decodeUser now UserDefaultConf{..} upsertData = do
           = ( ldapData `decodeLdap` ldapUserSurname
             , ldapData `decodeLdap` ldapUserFirstName
             , ldapData `decodeLdap` ldapUserDisplayName
-            , ldapData `decodeLdap` (Ldap.Attr "mail") -- TODO: use ldapUserEmail?
+            , ldapData `decodeLdap` Ldap.Attr "mail" -- TODO: use ldapUserEmail?
             , ldapData `decodeLdap` ldapUserTelephone
             , ldapData `decodeLdap` ldapUserMobile
             , ldapData `decodeLdap` ldapUserFraportPersonalnummer
@@ -388,9 +388,9 @@ decodeUser now UserDefaultConf{..} upsertData = do
 
   where
     mbAzureData :: Maybe (Map Text [ByteString])
-    mbAzureData = fmap (Map.fromListWith (++) . map (\(t,bs) -> (t, filter (not . ByteString.null) bs))) . concat $ preview _upsertUserAzureData <$> NonEmpty.toList upsertData
+    mbAzureData = fmap (Map.fromListWith (++) . map (second (filter (not . ByteString.null)))) . concat $ preview _upsertUserAzureData <$> NonEmpty.toList upsertData
     mbLdapData :: Maybe (Map Ldap.Attr [Ldap.AttrValue]) -- Recall: Ldap.AttrValue == ByteString
-    mbLdapData = fmap (Map.fromListWith (++) . map (\(t,bs) -> (t, filter (not . ByteString.null) bs))) . concat $ preview _upsertUserLdapData <$> NonEmpty.toList upsertData
+    mbLdapData = fmap (Map.fromListWith (++) . map (second (filter (not . ByteString.null)))) . concat $ preview _upsertUserLdapData <$> NonEmpty.toList upsertData
 
     -- just returns Nothing on error, pure
     decodeAzure :: Map Text [ByteString] -> Text -> Maybe Text