diff --git a/frontend/src/components/LanguageSwitch.spec.js b/frontend/src/components/LanguageSwitch.spec.js
index 7f37c535a..6c733de7d 100644
--- a/frontend/src/components/LanguageSwitch.spec.js
+++ b/frontend/src/components/LanguageSwitch.spec.js
@@ -15,7 +15,7 @@ describe('LanguageSwitch', () => {
   let wrapper
 
   const state = {
-    email: 'he@ho.he',
+    gradidoID: 'current-user-id',
     language: null,
   }
 
diff --git a/frontend/src/components/LanguageSwitch.vue b/frontend/src/components/LanguageSwitch.vue
index 9d901ae9f..38194ba9c 100644
--- a/frontend/src/components/LanguageSwitch.vue
+++ b/frontend/src/components/LanguageSwitch.vue
@@ -31,7 +31,7 @@ export default {
     async saveLocale(locale) {
       // if (this.$i18n.locale === locale) return
       this.setLocale(locale)
-      if (this.$store.state.email) {
+      if (this.$store.state.gradidoID) {
         this.$apollo
           .mutate({
             mutation: updateUserInfos,
diff --git a/frontend/src/components/LanguageSwitch2.spec.js b/frontend/src/components/LanguageSwitch2.spec.js
index 0d2b485ec..e7ff6e8c6 100644
--- a/frontend/src/components/LanguageSwitch2.spec.js
+++ b/frontend/src/components/LanguageSwitch2.spec.js
@@ -15,7 +15,7 @@ describe('LanguageSwitch', () => {
   let wrapper
 
   const state = {
-    email: 'he@ho.he',
+    gradidoID: 'current-user-id',
     language: null,
   }
 
diff --git a/frontend/src/components/LanguageSwitch2.vue b/frontend/src/components/LanguageSwitch2.vue
index d398d2fe0..46b2a5277 100644
--- a/frontend/src/components/LanguageSwitch2.vue
+++ b/frontend/src/components/LanguageSwitch2.vue
@@ -59,7 +59,7 @@ export default {
     async saveLocale(locale) {
       if (this.$i18n.locale === locale) return
       this.setLocale(locale)
-      if (this.$store.state.email) {
+      if (this.$store.state.gradidoID) {
         this.$apollo
           .mutate({
             mutation: updateUserInfos,
diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index 1e05df71d..a942c2644 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -20,7 +20,7 @@ const mocks = {
     state: {
       firstName: 'Testy',
       lastName: 'User',
-      email: 'testy.user@example.com',
+      gradidoID: 'current-user-id',
     },
   },
 }
@@ -64,8 +64,8 @@ describe('AuthNavbar', () => {
         )
       })
 
-      it('has the email address', () => {
-        // expect(wrapper.find('div.small:nth-child(2)').text()).toBe(wrapper.vm.$store.state.email)
+      // I think this should be username
+      it.skip('has the email address', () => {
         expect(wrapper.find('div[data-test="navbar-item-email"]').text()).toBe(
           wrapper.vm.$store.state.email,
         )
diff --git a/frontend/src/components/UserSettings/UserNewsletter.spec.js b/frontend/src/components/UserSettings/UserNewsletter.spec.js
index b211ec169..7ae3ddd7c 100644
--- a/frontend/src/components/UserSettings/UserNewsletter.spec.js
+++ b/frontend/src/components/UserSettings/UserNewsletter.spec.js
@@ -18,7 +18,6 @@ describe('UserCard_Newsletter', () => {
     $store: {
       state: {
         language: 'de',
-        email: 'peter@lustig.de',
         newsletterState: true,
       },
       commit: storeCommitMock,
diff --git a/frontend/src/layouts/DashboardLayout.spec.js b/frontend/src/layouts/DashboardLayout.spec.js
index 9f68199da..a2a666591 100644
--- a/frontend/src/layouts/DashboardLayout.spec.js
+++ b/frontend/src/layouts/DashboardLayout.spec.js
@@ -43,7 +43,6 @@ const mocks = {
   $store: {
     dispatch: storeDispatchMock,
     state: {
-      email: 'user@example.org',
       publisherId: 123,
       firstName: 'User',
       lastName: 'Example',
@@ -260,34 +259,6 @@ describe('DashboardLayout', () => {
         })
       })
 
-      describe.skip('elopage URI', () => {
-        describe('user has no publisher ID and no elopage', () => {
-          beforeEach(() => {
-            mocks.$store.state.publisherId = null
-            mocks.$store.state.hasElopage = false
-            wrapper = Wrapper()
-          })
-
-          it('links to basic-de', () => {
-            expect(wrapper.vm.elopageUri).toBe(
-              'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=2896&firstName=User&lastName=Example&email=user@example.org',
-            )
-          })
-        })
-
-        describe('user has elopage', () => {
-          beforeEach(() => {
-            mocks.$store.state.publisherId = '123'
-            mocks.$store.state.hasElopage = true
-            wrapper = Wrapper()
-          })
-
-          it('links to sign in for elopage', () => {
-            expect(wrapper.vm.elopageUri).toBe('https://elopage.com/s/gradido/sign_in?locale=en')
-          })
-        })
-      })
-
       describe.skip('admin method', () => {
         const windowLocationMock = jest.fn()
         beforeEach(() => {