diff --git a/src/Foundation.hs b/src/Foundation.hs
index cb727fe20..1424bb13d 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -434,8 +434,8 @@ tagAccessPredicate AuthTime = APDB $ \route _ -> case route of
       SFileR SheetHint     _ -> guard $ maybe False (<= cTime) sheetHintFrom
       SFileR SheetSolution _ -> guard $ maybe False (<= cTime) sheetSolutionFrom
       SubmissionNewR         -> guard   active
+      SubmissionR _ SAssignR -> guard   marking -- Correctors can only be assigned when the Sheet is inactive, since submissions are subject to change
       SubmissionR _ _        -> guard   active
-      SubmissionR _ SAssignR -> guard $ marking -- Correctors can only be assigned when the Sheet is inactive, since submissions are subject to change
       _                      -> return ()
 
     return Authorized
diff --git a/src/Handler/Utils/Form.hs b/src/Handler/Utils/Form.hs
index ce9aeec62..079897003 100644
--- a/src/Handler/Utils/Form.hs
+++ b/src/Handler/Utils/Form.hs
@@ -498,7 +498,7 @@ funcForm :: forall k v m.
 funcForm mkForm FieldSettings{fsName = _, fsAttrs = _, ..} isRequired = formToAForm $ funcFieldView =<< renderAForm FormStandard funcForm' mempty
   where
     funcForm' :: AForm m (k -> v)
-    funcForm' = fmap (\m x -> m ! x) . sequenceA . Map.fromSet mkForm $ Set.fromList universeF
+    funcForm' = fmap (!) . sequenceA . Map.fromSet mkForm $ Set.fromList universeF
     funcFieldView :: (FormResult (k -> v), Widget) -> MForm m (FormResult (k -> v), [FieldView UniWorX])
     funcFieldView (res, fvInput) = do
       mr <- getMessageRender