diff --git a/client/src/pages/check-email.vue b/client/src/pages/check-email.vue
index 70f19bda..bc2cd293 100644
--- a/client/src/pages/check-email.vue
+++ b/client/src/pages/check-email.vue
@@ -1,9 +1,17 @@
 <template>
   <div class="check-email">
-    <main class="check-email__content" data-cy="email-check">
-      Ein Email ist auf dem Weg, bitte überprüfen sie ihre E-mail Konto.
+    <main class="check-email__content content" data-cy="email-check">
+      <p class="content__instructions">Ein Email ist auf dem Weg, bitte überprüfen sie ihre E-mail Konto.</p>
     </main>
 
   </div>
 
 </template>
+
+<style scoped lang="scss">
+@import "@/styles/_variables.scss";
+
+.content__instructions {
+  margin-top: $medium-spacing;
+}
+</style>
diff --git a/client/src/pages/joinClass.vue b/client/src/pages/joinClass.vue
index bbacf9d0..a7709cbb 100644
--- a/client/src/pages/joinClass.vue
+++ b/client/src/pages/joinClass.vue
@@ -21,7 +21,7 @@
 
       <div>
         <a class="button button--primary button--big" data-cy="join-class" @click="joinClass(code)">Klasse beitreten</a>
-        <a class="button button--big" data-cy="join-class-cancel" @click="cancel">Abbrechen</a>
+        <button class="button button--big" data-cy="join-class-cancel" @click="logout">Abmelden</button>
       </div>
 
     </div>
@@ -31,6 +31,7 @@
 <script>
   import JOIN_CLASS_MUTATION from '@/graphql/gql/mutations/joinClass.gql';
   import MY_SCHOOL_CLASS_QUERY from '@/graphql/gql/mySchoolClass';
+  import LOGOUT_MUTATION from '@/graphql/gql/mutations/logoutUser.gql';
 
   import addSchoolClassMixin from '@/mixins/add-school-class';
 
@@ -74,8 +75,12 @@
             }
           })
       },
-      cancel() {
-        this.$router.go(-1);
+      logout() {
+        this.$apollo.mutate({
+          mutation: LOGOUT_MUTATION,
+        }).then(({data}) => {
+          if (data.logout.success) { location.replace('/') }
+        });
       }
     }
   }
diff --git a/client/src/router/index.js b/client/src/router/index.js
index cf289493..362486e7 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -31,7 +31,6 @@ import login from '@/pages/login'
 import betaLogin from '@/pages/beta-login'
 import hello from '@/pages/hello'
 import registration from '@/pages/registration'
-import waitForClass from '@/pages/waitForClass'
 import checkEmail from '@/pages/check-email'
 import emailVerification from '@/pages/email-verification'
 import licenseActivation from '@/pages/license-activation'
@@ -148,7 +147,7 @@ const routes = [
       {path: 'show-code', name: 'show-code', component: showCode, meta: {layout: 'simple'}},
     ]
   },
-  {path: 'join-class', name: 'join-class', component: joinClass, meta: {layout: 'simple'}},
+  {path: 'join-class', name: 'join-class', component: joinClass, meta: {layout: 'public'}},
   {
     path: '/survey/:id',
     component: surveyPage,
@@ -165,12 +164,6 @@ const routes = [
       layout: 'public',
     }
   },
-  {
-    path: '/no-class',
-    component: waitForClass,
-    name: 'noClass',
-    meta: {layout: 'public'}
-  },
   {
     path: '/check-email',
     component: checkEmail,