diff --git a/client/src/pages/registration.vue b/client/src/pages/registration.vue
index 859e32bb..e3308d57 100644
--- a/client/src/pages/registration.vue
+++ b/client/src/pages/registration.vue
@@ -161,7 +161,7 @@
           v-model="password"
           data-vv-as="Passwort"
           v-validate="'required|strongPassword'"
-          :class="{ 'skillboxform-input__input--error': errors.has('password') }"
+          :class="{ 'skillboxform-input__input--error': errors.has('password')  && submitted }"
           class="change-form__new skillbox-input skillboxform-input__input"
           autocomplete="off"
           data-cy="password-input"
@@ -182,7 +182,7 @@
           v-model="passwordConfirmation"
           data-vv-as="Passwort wiederholen"
           v-validate="'required|confirmed:password'"
-          :class="{ 'skillboxform-input__input--error': errors.has('passwordConfirmation') }"
+          :class="{ 'skillboxform-input__input--error': errors.has('passwordConfirmation') && submitted }"
           class="change-form__new skillbox-input skillboxform-input__input"
           autocomplete="off"
           data-cy="passwordConfirmation-input"
diff --git a/client/src/pages/waitForClass.vue b/client/src/pages/waitForClass.vue
deleted file mode 100644
index 7531fe01..00000000
--- a/client/src/pages/waitForClass.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <div class="no-class public-page">
-    <h1 class="public-page__title">Sie sind keiner Klasse zugeteilt</h1>
-    <p>Sie können mySkillbox nur verwenden wenn Sie in einer Klasse zugeteilt sind. Aktuell kann Sie nur der mySkillbox-Support einer Klasse zuteilen.</p>
-    <button class="button button--primary button--big logout-button" @click="logout">Abmelden</button>
-  </div>
-</template>
-
-<script>
-  import LOGOUT_MUTATION from '@/graphql/gql/mutations/logoutUser.gql';
-
-  export default {
-
-    methods: {
-      logout() {
-        this.$apollo.mutate({
-          mutation: LOGOUT_MUTATION,
-        }).then(({data}) => {
-          if (data.logout.success) { location.replace('/') }
-        });
-      }
-    }
-  }
-</script>
-<style scoped lang="scss">
-  @import "@/styles/_variables.scss";
-
-  .logout-button {
-    margin-top: $large-spacing;
-  }
-</style>