diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 8559633b..27b94d69 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -31,10 +31,6 @@ const registration = {
     if ((!this.registrationOpen && !this.token) || this.signedIn) {
       this.$router.push('/main/all')
     }
-    // // Seems like this doesn't work at first page open for some reason
-    // if (this.$store.state.instance.registrationOpen && this.token) {
-    //   this.$router.push('/registration')
-    // }
   },
   computed: {
     token () { return this.$route.params.token },
@@ -43,7 +39,7 @@ const registration = {
       signedIn: (state) => !!state.users.currentUser,
       isPending: (state) => state.users[SIGN_UP.isPending],
       serverValidationErrors: (state) => state.users[SIGN_UP.errors],
-      termsofservice: (state) => state.instance.tos
+      termsOfService: (state) => state.instance.tos
     })
   },
   methods: {
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index fcc41d32..9c40e050 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -74,13 +74,7 @@
                 </li>
               </ul>
             </div>
-            <!--
-            <div class='form-group'>
-              <label for='captcha'>Captcha</label>
-              <img src='/qvittersimplesecurity/captcha.jpg' alt='captcha' class='captcha'>
-              <input :disabled="registering" v-model='user.captcha' placeholder='Enter captcha' type='test' class='form-control' id='captcha'>
-            </div>
-            -->
+
             <div class='form-group' v-if='token' >
               <label for='token'>{{$t('registration.token')}}</label>
               <input disabled='true' v-model='token' class='form-control' id='token' type='text'>
@@ -89,12 +83,10 @@
               <button :disabled="isPending" type='submit' class='btn btn-default'>{{$t('general.submit')}}</button>
             </div>
           </div>
-          <div class='terms-of-service' v-html="termsofservice">
+
+          <div class='terms-of-service' v-html="termsOfService">
           </div>
         </div>
-        <div v-if="clientValidationFailed">
-          <span>Form is invalid</span>
-        </div>
         <div v-if="serverValidationErrors.length" class='form-group'>
           <div class='alert error'>
             <span v-for="error in serverValidationErrors">{{error}}</span>
@@ -165,7 +157,7 @@
   }
 
   .form-group--error .form--label {
-    color: #f04124;
+    color: var(--cRed, #f04124);
   }
 
   .form-error {
@@ -198,8 +190,6 @@
   }
 
   .btn {
-    //align-self: flex-start;
-    //width: 10em;
     margin-top: 0.6em;
     height: 28px;
   }
diff --git a/src/mutation_types.js b/src/mutation_types.js
index 026c5540..f25ae174 100644
--- a/src/mutation_types.js
+++ b/src/mutation_types.js
@@ -1,7 +1,9 @@
 export const SIGN_UP = {
+  // mutations
   SUCCESS: 'SIGN_UP_SUCCESS',
   FAILURE: 'SIGN_UP_FAILURE',
   PENDING: 'SIGN_UP_PENDING',
+  // state
   isPending: 'sign_up_pending',
   errors: 'sign_up_errors'
 }