diff --git a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
index 2987961a12e905d4f978606476629dd6424c378b..b9765e1f73eb2351478b56f16add0cdf9fb0231f 100644
--- a/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
+++ b/frontend/src/components/submission_notes/toolbars/AnnotatedSubmissionBottomToolbar.vue
@@ -49,7 +49,7 @@
                     v-model="isFinal"
                     class="final-checkbox" />
                   </v-toolbar-items>
-                  <span>Non final feedback will be sent to the reviewer.</span>
+                  <span>If unchecked this submission will be marked for review by the lecturer</span>
                 </v-tooltip>
               </v-flex>
               <v-flex xs>
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index c73fc809faecfbe88e86a964e972197e473ed8be..1b3bdb47bb5c609443d50a437962f97b98fbc53f 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -79,8 +79,13 @@ export default {
       }).then(() => {
         this.$router.push({ name: 'home' })
         this.loading = false
-      }).catch((er) => {
-        Auth.SET_MESSAGE("Login failed. Please try again.")
+      }).catch((err) => {
+        let msg = "Login failed. Please try again."
+        if (typeof err === "string") {
+          msg = err
+        }
+
+        Auth.SET_MESSAGE(msg)
         this.loading = false
       })
     },