diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs
index 547c4e07c..79236d154 100644
--- a/src/Handler/Firm.hs
+++ b/src/Handler/Firm.hs
@@ -530,7 +530,7 @@ mkFirmAllTable isAdmin uid = do
         dbtRowKey = (E.^. CompanyId)
         dbtProj = dbtProjId
         dbtColonnade = formColonnade $ mconcat
-          [ guardMonoid isAdmin $ dbSelect (applying _2) id (return . view (resultAllCompanyEntity . _entityKey))
+          [ dbSelect (applying _2) id (return . view (resultAllCompanyEntity . _entityKey))
           , sortable (Just "name")          (i18nCell MsgTableCompany)                 $ \(view resultAllCompany -> firm) ->
               anchorCell (FirmUsersR $ companyShorthand firm) . toWgt $ companyName firm
           , sortable (Just "short")         (i18nCell MsgTableCompanyShort)            $ \(view resultAllCompany -> firm) ->
@@ -748,7 +748,7 @@ mkFirmUserTable isAdmin cid = do
         dbtRowKey = queryUserUser >>> (E.^. UserId)
         dbtProj = dbtProjId
         dbtColonnade = formColonnade $ mconcat
-          [ guardMonoid isAdmin $ dbSelect (applying _2) id (return . view (resultUserUser . _entityKey))
+          [ dbSelect (applying _2) id (return . view (resultUserUser . _entityKey))
           , colUserNameModalHdr MsgTableCompanyUser ForProfileDataR
           , guardMonoid isAdmin $ sortable (Just "matriculation")   (i18nCell MsgTableMatrikelNr)              $ \(view resultUserUser           -> entUsr ) -> cellHasMatrikelnummerLinkedAdmin entUsr
           , sortable (Just "personal-number") (i18nCell MsgCompanyPersonalNumber)        $ \(view $ resultUserUser . _userCompanyPersonalNumber -> t) -> foldMap textCell t
@@ -834,7 +834,7 @@ mkFirmUserTable isAdmin cid = do
         dbtStyle =  def { dbsFilterLayout = defaultDBSFilterLayout }
         acts :: Map FirmUserAction (AForm Handler FirmUserActionData)
         acts = mconcat
-          [ singletonMap FirmUserActNotify      $ pure FirmUserActNotifyData
+          [ guardMonoid isAdmin $ singletonMap FirmUserActNotify $ pure FirmUserActNotifyData
           , singletonMap FirmUserActResetSupervision $ FirmUserActResetSupervisionData
               <$> aopt (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgFirmActResetSuperKeep)         (Just $ Just False)
               -- <*> aopt checkBoxField                                      (fslI MsgFirmActResetMutualSupervision) (Just $ Just True )
@@ -883,7 +883,7 @@ mkFirmUserTable isAdmin cid = do
 getFirmUsersR, postFirmUsersR :: CompanyShorthand -> Handler Html
 getFirmUsersR  = postFirmUsersR
 postFirmUsersR fsh = do
-  isAdmin <- checkAdmin
+  isAdmin <- checkAdmin  
   let cid = CompanyKey fsh
   ((    Entity{entityVal=Company{..}}
       , E.Value nrCompanyUsers
@@ -1052,7 +1052,7 @@ mkFirmSuperTable isAdmin cid = do
               return (cmp E.^. CompanyName, cmp E.^. CompanyShorthand, usrCmp E.^. UserCompanySupervisor)
             return (usr, supervised, rerouted, cmps, supervisor, reroute)
         dbtColonnade = formColonnade $ mconcat
-          [ guardMonoid isAdmin $ dbSelect (applying _2) id (return . view (resultSuperUser . _entityKey))
+          [ dbSelect (applying _2) id (return . view (resultSuperUser . _entityKey))
           , colUserNameModalHdr MsgTableSupervisor ForProfileDataR
           , guardMonoid isAdmin $ sortable (Just "matriculation")   (i18nCell MsgTableMatrikelNr)              $ \(view   resultSuperUser                         -> entUsr) -> cellHasMatrikelnummerLinkedAdmin entUsr
           , sortable (Just "user-company") (i18nCell MsgTableCompanies) $ \( view resultSuperCompanies -> cmps) ->
@@ -1092,7 +1092,7 @@ mkFirmSuperTable isAdmin cid = do
         dbtStyle =  def { dbsFilterLayout = defaultDBSFilterLayout }
         acts :: Map FirmSuperAction (AForm Handler FirmSuperActionData)
         acts = mconcat
-          [ singletonMap FirmSuperActNotify     $ pure FirmSuperActNotifyData
+          [ guardMonoid isAdmin $ singletonMap FirmSuperActNotify $ pure FirmSuperActNotifyData
           , singletonMap FirmSuperActRMSuperDef $ FirmSuperActRMSuperDefData
               <$> aopt checkBoxField (fslI MsgFirmSuperActRMSuperActive) (Just $ Just True)
           ]