diff --git a/client/cypress/integration/join-class.spec.js b/client/cypress/integration/join-class.spec.js
index b8306154..38eb04ac 100644
--- a/client/cypress/integration/join-class.spec.js
+++ b/client/cypress/integration/join-class.spec.js
@@ -34,7 +34,9 @@ describe('Join Class', () => {
 
     cy.visit('/me/profile');
 
-    cy.get('[data-cy=user-widget-avatar]').click();
+    cy.get('[data-cy=header-user-widget]').within(() => {
+      cy.get('[data-cy=user-widget-avatar]').click();
+    });
     cy.get('[data-cy=class-selection]').click();
     cy.get('[data-cy=class-selection-entry]').should('have.length', 1);
 
@@ -42,7 +44,11 @@ describe('Join Class', () => {
 
     cy.get('[data-cy=input-class-code]').type('XXXX');
     cy.get('[data-cy=join-class]').click();
-    
+
+    cy.get('[data-cy=header-user-widget]').within(() => {
+      cy.get('[data-cy=user-widget-avatar]').click();
+    });
+
     cy.get('[data-cy=class-selection]').click();
     cy.get('[data-cy=class-selection-entry]').should('have.length', 2);
   })
diff --git a/client/src/components/HeaderBar.vue b/client/src/components/HeaderBar.vue
index 6416615e..42e660a2 100644
--- a/client/src/components/HeaderBar.vue
+++ b/client/src/components/HeaderBar.vue
@@ -7,7 +7,7 @@
     <div class="user-header">
       <a class="user-header__sidebar-link" @click="openSidebar()"><current-class class="user-header__current-class"/></a>
 
-      <user-widget v-bind="me"></user-widget>
+      <user-widget data-cy="header-user-widget" v-bind="me"></user-widget>
     </div>
     <book-navigation v-if="showSubnavigation">
     </book-navigation>
diff --git a/client/src/components/profile/ProfileSidebar.vue b/client/src/components/profile/ProfileSidebar.vue
index c2a8225d..9b806b26 100644
--- a/client/src/components/profile/ProfileSidebar.vue
+++ b/client/src/components/profile/ProfileSidebar.vue
@@ -15,7 +15,7 @@
       </div>
     </div>
     <div class="profile-sidebar__item" @click="closeSidebar">
-      <router-link :to="{name:'join-class'}" class="profile-sidebar__link">Zugangscode eingeben</router-link>
+      <router-link :to="{name:'join-class'}" data-cy="join-class-link" class="profile-sidebar__link">Zugangscode eingeben</router-link>
     </div>
     <div class="profile-sidebar__item" @click="logout">
       <a class="profile-sidebar__link">Logout</a>