From bf466c688deea160e6eb6922b5a3eaaabaf590a6 Mon Sep 17 00:00:00 2001
From: Steffen Jost <jost@tcs.ifi.lmu.de>
Date: Fri, 10 Feb 2023 12:51:08 +0100
Subject: [PATCH] chore(email): obey email/postal preference even if no pin
 password is set

---
 src/Handler/Utils/Users.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Handler/Utils/Users.hs b/src/Handler/Utils/Users.hs
index 9c89b992b..b211bc34c 100644
--- a/src/Handler/Utils/Users.hs
+++ b/src/Handler/Utils/Users.hs
@@ -72,11 +72,11 @@ userPrefersEmail = not . userPrefersLetter
 -- | result (True, Nothing) indicates that neither userEmail nor userPostAddress is known
 getPostalPreferenceAndAddress :: User -> (Bool, Maybe [Text])
 getPostalPreferenceAndAddress usr@User{..} =
-    (((userPrefersPostal || isNothing userPinPassword) && postPossible) || emailImpossible, pa)
-  where
-    orgEmail        = CI.original userEmail
-    emailImpossible = validEmail orgEmail
-    postPossible    = isJust pa
+    ((userPrefersPostal && postPossible) || not emailPossible, pa)
+    -- (((userPrefersPostal || isNothing userPinPassword) && postPossible) || not emailPossible, pa) -- ignore email/post preference if no pinPassword is set
+  where    
+    emailPossible = validEmail' userEmail
+    postPossible  = isJust pa
     pa = getPostalAddress usr
 
 getPostalAddress :: User -> Maybe [Text]