diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs
index 11ff2e4fa..f86048434 100644
--- a/src/Handler/Firm.hs
+++ b/src/Handler/Firm.hs
@@ -1102,10 +1102,14 @@ postFirmSupersR fsh = do
       addMessageI Info $ MsgRemoveSupervisors nrRmSuper nrRmActual
       reloadKeepGetParams $ FirmUsersR fsh -- reload to reflect changes
     (FirmSuperActSwitchSuperData{..}, Set.toList -> uids) -> do
-      let fltrSpr = guardMonoid (isNothing firmSuperActSwitchSuper) [UserCompanySupervisor ==. True]
-          changes = maybeEmpty firmSuperActSwitchSuper   (pure . (UserCompanySupervisor        =.))
-                 <> guardMonoid (firmSuperActSwitchSuper /= Just False || firmSuperActSwitchReroute == Just False) (
-                    maybeEmpty firmSuperActSwitchReroute (pure . (UserCompanySupervisorReroute =.)))
+      let (fltrSpr, changes) = case (firmSuperActSwitchSuper, firmSuperActSwitchReroute) of        
+            (Just True, Nothing)  -> ([UserCompanySupervisor ==. False], [UserCompanySupervisor =. True ])
+            (Just True, Just rer) -> ([UserCompanySupervisor ==. False] ||. [UserCompanySupervisorReroute !=. rer]
+                                                                       , [UserCompanySupervisor =. True ,        UserCompanySupervisorReroute =. rer  ])
+            (Just False, _)       -> ([UserCompanySupervisor ==. True ], [UserCompanySupervisor =. False,        UserCompanySupervisorReroute =. False])
+            (Nothing, Just True)  -> ([UserCompanySupervisor ==. True, UserCompanySupervisorReroute ==. False], [UserCompanySupervisorReroute =. True ])
+            (Nothing, Just False) -> ([                                UserCompanySupervisorReroute ==. True ], [UserCompanySupervisorReroute =. False])
+            (Nothing, Nothing   ) -> ([],[])
       nrSuperChanges <- runDB $ updateWhereCount (fltrSpr <> [UserCompanyUser <-. uids, UserCompanyCompany ==. cid]) changes
       addMessageI Info $ MsgFirmActAddSupersSet nrSuperChanges Nothing
       reloadKeepGetParams $ FirmUsersR fsh -- reload to reflect changes