diff --git a/src/Foundation.hs b/src/Foundation.hs
index a01f6744f..47f7640f3 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -269,7 +269,7 @@ instance HasRoute UniWorX MenuItem where
   urlRoute MenuItem{..} = urlRoute menuItemRoute
 
 menuItemAccessCallback :: MenuItem -> Handler Bool
-menuItemAccessCallback MenuItem{..} = (&&) <$> ((==) Authorized <$> authCheck) <*> menuItemAccessCallback'
+menuItemAccessCallback MenuItem{..} = and2M ((==) Authorized <$> authCheck) menuItemAccessCallback'
   where
     authCheck = handleAny (\_ -> return . Unauthorized $ error "authCheck caught exception") $ isAuthorized (urlRoute menuItemRoute) False
 
diff --git a/src/Handler/Corrections.hs b/src/Handler/Corrections.hs
index 5b8cd35c7..1fece3778 100644
--- a/src/Handler/Corrections.hs
+++ b/src/Handler/Corrections.hs
@@ -479,11 +479,9 @@ assignAction selId = ( CorrSetCorrector
 
                            E.distinct $ return user
 
-                         mr <- getMessageRender
+                         correctors' <- forM correctors $ \Entity{ entityKey, entityVal = User{..} } -> (SomeMessage userDisplayName, ) <$> encrypt entityKey
 
-                         correctors' <- fmap ((mr MsgNoCorrector, Nothing) :) . forM correctors $ \Entity{ entityKey, entityVal = User{..} } -> (display userDisplayName, ) . Just <$> encrypt entityKey
-
-                         cId <- wpreq (selectFieldList correctors' :: Field (HandlerT UniWorX IO) (Maybe CryptoUUIDUser)) (fslI MsgCorrector) Nothing
+                         cId <- wopt (selectFieldList correctors' :: Field (HandlerT UniWorX IO) CryptoUUIDUser) (fslI MsgCorrector) Nothing
                          fmap CorrSetCorrectorData <$> (traverse.traverse) decrypt cId
                      )