diff --git a/client/cypress/integration/school-class.spec.js b/client/cypress/integration/school-class.spec.js
index 0f63232f..4309617d 100644
--- a/client/cypress/integration/school-class.spec.js
+++ b/client/cypress/integration/school-class.spec.js
@@ -139,9 +139,7 @@ describe('Class Management', () => {
     cy.get('[data-cy=active-class-members-list]').within(() => {
       cy.get('[data-cy=school-class-member]').should('have.length', 2)
     });
-    cy.get('[data-cy=inactive-class-members-list]').within(() => {
-      cy.get('[data-cy=school-class-member]').should('have.length', 0)
-    });
+    cy.get('[data-cy=inactive-class-members-list]').should('not.exist');
 
     cy.get('[data-cy=remove-from-class]').first().click();
 
@@ -157,9 +155,7 @@ describe('Class Management', () => {
     cy.get('[data-cy=active-class-members-list]').within(() => {
       cy.get('[data-cy=school-class-member]').should('have.length', 2)
     });
-    cy.get('[data-cy=inactive-class-members-list]').within(() => {
-      cy.get('[data-cy=school-class-member]').should('have.length', 0)
-    });
+    cy.get('[data-cy=inactive-class-members-list]').should('not.exist');
   });
 
   it('should display old classes', () => {
diff --git a/client/src/components/school-class/ClassSelectionWidget.vue b/client/src/components/school-class/ClassSelectionWidget.vue
index 0cfa1ce4..a50265b7 100644
--- a/client/src/components/school-class/ClassSelectionWidget.vue
+++ b/client/src/components/school-class/ClassSelectionWidget.vue
@@ -20,10 +20,10 @@
       <li class="popover-links__link popover-links__link--large popover-links__divider"
           v-if="me.isTeacher"
           data-cy="create-class-link" @click="closeSidebar">
-        <router-link :to="{name: 'create-class'}">Klasse erfassen</router-link>
+        <router-link tag="span" :to="{name: 'create-class'}">Klasse erfassen</router-link>
       </li>
       <li class="popover-links__link popover-links__link--large popover-links__divider" @click="closeSidebar">
-        <router-link :to="{name: 'old-classes'}">Alte Klassen anzeigen</router-link>
+        <router-link tag="span" :to="{name: 'old-classes'}">Alte Klassen anzeigen</router-link>
       </li>
     </widget-popover>
   </div>
diff --git a/client/src/mixins/me.js b/client/src/mixins/me.js
index 7bb9192b..bcd8d734 100644
--- a/client/src/mixins/me.js
+++ b/client/src/mixins/me.js
@@ -8,7 +8,8 @@ export default {
           id: ''
         },
         permissions: [],
-        schoolClasses: []
+        schoolClasses: [],
+        isTeacher: false
       },
       showPopover: false
     }
@@ -17,12 +18,10 @@ export default {
   apollo: {
     me: {
       query: ME_QUERY,
-      manual: true,
-      result({data, loading, networkStatus}) {
-        if (!loading) {
-          this.me = this.$getRidOfEdges(data).me;
-        }
-      }
+      update(data) {
+        return this.$getRidOfEdges(data).me;
+      },
+      fetchPolicy: 'cache-first'
     },
   },
 }