diff --git a/client/cypress/fixtures/me.minimal.js b/client/cypress/fixtures/me.minimal.js
index fb4107f1..605466be 100644
--- a/client/cypress/fixtures/me.minimal.js
+++ b/client/cypress/fixtures/me.minimal.js
@@ -1,17 +1,18 @@
 const minimalMe = {
-    username: '',
-    firstName: '',
-    lastName: '',
-    avatarUrl: '',
-    email: '',
-    onboardingVisited: true,
-    schoolClasses: {},
-    id: '',
+  username: '',
+  firstName: '',
+  lastName: '',
+  avatarUrl: '',
+  email: '',
+  onboardingVisited: true,
+  schoolClasses: {},
+  id: '',
+  readOnly: false,
 };
 
 export const getMe = isTeacher => ({
-    ...minimalMe,
-    isTeacher,
+  ...minimalMe,
+  isTeacher,
 });
 
 export default getMe;
diff --git a/client/cypress/support/helpers.js b/client/cypress/support/helpers.js
index f704d728..e4106d10 100644
--- a/client/cypress/support/helpers.js
+++ b/client/cypress/support/helpers.js
@@ -23,6 +23,7 @@ export const getMe = ({schoolClasses, teacher}) => {
       'lastName': 'Cueni',
       'avatarUrl': '',
       'isTeacher': teacher,
+      readOnly: false,
       'lastModule': {
         'id': 'TW9kdWxlTm9kZToxNw==',
         'slug': 'lohn-und-budget',
diff --git a/client/src/components/content-blocks/assignment/SubmissionForm.vue b/client/src/components/content-blocks/assignment/SubmissionForm.vue
index 008a49f9..46dbe087 100644
--- a/client/src/components/content-blocks/assignment/SubmissionForm.vue
+++ b/client/src/components/content-blocks/assignment/SubmissionForm.vue
@@ -4,7 +4,7 @@
       <submission-input
         :input-text="userInput.text"
         :saved="saved"
-        :readonly="isReadOnly"
+        :readonly="isFinalOrReadOnly"
         :placeholder="placeholder"
         @input="saveInput"
       />
@@ -12,7 +12,7 @@
 
     <div
       class="submission-form-container__actions"
-      v-if="!isReadOnly">
+      v-if="!isFinalOrReadOnly">
       <button
         class="submission-form-container__submit button button--primary button--white-bg"
         data-cy="submission-form-submit"