diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs
index 5c2acdd0a..39730ffd5 100644
--- a/src/Handler/Profile.hs
+++ b/src/Handler/Profile.hs
@@ -370,7 +370,7 @@ validateSettings User{..} = do
 
   userPrefersPostal' <- use _stgPrefersPostal
   guardValidation MsgUserPrefersPostalInvalid $
-    not $ userPrefersPostal' && postalNotSet
+    not $ userPrefersPostal' && (postalNotSet || isJust userCompanyDepartment)
 
   userPinPassword'  <- use _stgPinPassword
   let pinBad     = validCmdArgument =<< userPinPassword'