diff --git a/src/Handler/Submission.hs b/src/Handler/Submission.hs
index 130bfaa73..1f0d3c5a4 100644
--- a/src/Handler/Submission.hs
+++ b/src/Handler/Submission.hs
@@ -246,6 +246,8 @@ submissionHelper tid csh shn (SubmissionMode mcid) = do
     Nothing  -> return ()
 
   actionUrl <- Data.Maybe.fromJust <$> getCurrentRoute
+  maySubmit <- (== Authorized) <$> isAuthorized actionUrl True
+
   -- Maybe construct a table to display uploaded archive files
   let colonnadeFiles :: _ -> Colonnade Sortable _ (DBCell (WidgetT UniWorX IO) ())
       colonnadeFiles cid = mconcat
@@ -355,7 +357,8 @@ getSubArchiveR tid csh shn cID@CryptoID{..} (ZIPArchiveName sfType) = do
 
       fileSource' = do
         fileSource .| Conduit.map entityVal
-        maybe (return ()) (yieldM . ratingFile cID) rating
+        when (sfType == SubmissionCorrected) $
+          maybe (return ()) (yieldM . ratingFile cID) rating
 
       zipComment = Text.encodeUtf8 . pack $ CI.foldedCase ciphertext
 
diff --git a/templates/submission.hamlet b/templates/submission.hamlet
index 1672ee052..e2c77382d 100644
--- a/templates/submission.hamlet
+++ b/templates/submission.hamlet
@@ -12,6 +12,7 @@ $maybe cID <- mcid
       <h3>_{MsgSubmissionFiles}
       ^{fileTable}
 
-<section>
-  <form .form-horizontal method=post action=@{actionUrl} enctype=#{formEnctype}>
-   ^{formWidget}
+$if maySubmit
+  <section>
+    <form .form-horizontal method=post action=@{actionUrl} enctype=#{formEnctype}>
+      ^{formWidget}