diff --git a/src/Handler/LMS.hs b/src/Handler/LMS.hs
index f844633b8..3910e1309 100644
--- a/src/Handler/LMS.hs
+++ b/src/Handler/LMS.hs
@@ -556,8 +556,7 @@ postLmsR sid qsh = do
               let icnSuper = text2markup " " <> icon IconSupervisor
                   cs =  [ (cmpName, cmpSpr) 
                         | Entity _ UserCompany{userCompanyCompany=cmpId, userCompanySupervisor=cmpSpr} <- cmps
-                        , let cmpEnt = Map.lookup cmpId cmpMap
-                        , Just Company{companyName = cmpName} <- [cmpEnt]
+                        , let cmpName = maybe cmpId companyName $ Map.lookup cmpId cmpMap                        
                         ]
                   companies = intercalate (text2markup ", ") $
                     (\(cmpName, cmpSpr) -> text2markup (CI.original cmpName) <> bool mempty icnSuper cmpSpr) <$> cs
diff --git a/src/Handler/Qualification.hs b/src/Handler/Qualification.hs
index 386bc4bf9..c4b3d64e0 100644
--- a/src/Handler/Qualification.hs
+++ b/src/Handler/Qualification.hs
@@ -489,7 +489,7 @@ postQualificationR sid qsh = do
           [ singletonMap QualificationActUnblock         $ pure QualificationActUnblockData           -- Admin-only actions
           , singletonMap QualificationActBlock           $      QualificationActBlockData 
               <$> apreq textField (fslI MsgQualificationBlockReason) Nothing
-              <*> apreq (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgQualificationBlockNotify) (Just False)
+              <*> areq (boolField . Just $ SomeMessage MsgBoolIrrelevant) (fslI MsgQualificationBlockNotify) (Just False)
           , singletonMap QualificationActRenew           $ pure QualificationActRenewData
           , singletonMap QualificationActGrant           
               (QualificationActGrantData <$> apopt dayField (fslI MsgLmsQualificationValidUntil) dayExpiry)
@@ -504,9 +504,8 @@ postQualificationR sid qsh = do
           , sortable (Just "user-company") (i18nCell MsgTableCompanies) $ \( view resultCompanyUser -> cmps) ->
               let icnSuper = text2markup " " <> icon IconSupervisor
                   cs =  [ (cmpName, cmpSpr) 
-                        | Entity _ UserCompany{userCompanyCompany=cmpId, userCompanySupervisor=cmpSpr} <- cmps
-                        , let cmpEnt = Map.lookup cmpId cmpMap
-                        , Just Company{companyName = cmpName} <- [cmpEnt]
+                        | Entity _ UserCompany{userCompanyCompany=cmpId, userCompanySupervisor=cmpSpr} <- cmps                        
+                        , let cmpName = maybe cmpId companyName $ Map.lookup cmpId cmpMap
                         ]
                   companies = intercalate (text2markup ", ") $
                     (\(cmpName, cmpSpr) -> text2markup (CI.original cmpName) <> bool mempty icnSuper cmpSpr) <$> cs