diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts
index a22715fb4..3307252e4 100644
--- a/backend/src/graphql/resolver/ContributionResolver.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.ts
@@ -3,7 +3,7 @@ import { Context, getUser } from '@/server/context'
 import { backendLogger as logger } from '@/server/logger'
 import { Contribution as dbContribution } from '@entity/Contribution'
 import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql'
-import { FindOperator, IsNull } from '@dbTools/typeorm'
+import { FindOperator, IsNull, getConnection } from '@dbTools/typeorm'
 import ContributionArgs from '@arg/ContributionArgs'
 import Paginated from '@arg/Paginated'
 import { Order } from '@enum/Order'
@@ -106,14 +106,15 @@ export class ContributionResolver {
     @Args()
     { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
   ): Promise<ContributionListResult> {
-    const [dbContributions, count] = await dbContribution.findAndCount({
-      relations: ['user'],
-      order: {
-        createdAt: order,
-      },
-      skip: (currentPage - 1) * pageSize,
-      take: pageSize,
-    })
+    const [dbContributions, count] = await getConnection()
+      .createQueryBuilder()
+      .select('c')
+      .from(dbContribution, 'c')
+      .innerJoinAndSelect('c.user', 'u')
+      .orderBy('c.createdAt', order)
+      .limit(pageSize)
+      .offset((currentPage - 1) * pageSize)
+      .getManyAndCount()
     return new ContributionListResult(
       count,
       dbContributions.map(
diff --git a/frontend/src/components/ContentFooter.spec.js b/frontend/src/components/ContentFooter.spec.js
index f67560e44..c578d3fac 100644
--- a/frontend/src/components/ContentFooter.spec.js
+++ b/frontend/src/components/ContentFooter.spec.js
@@ -97,24 +97,14 @@ describe('ContentFooter', () => {
         )
       })
 
-      it('has a link to the members area', () => {
-        expect(wrapper.findAll('a.nav-link').at(2).text()).toEqual('navigation.members_area')
-      })
-
-      it('links to the elopage', () => {
-        expect(wrapper.findAll('a.nav-link').at(2).attributes('href')).toEqual(
-          'https://elopage.com/s/gradido/sign_in?locale=en',
-        )
-      })
-
       it('links to the whitepaper', () => {
-        expect(wrapper.findAll('a.nav-link').at(3).attributes('href')).toEqual(
+        expect(wrapper.findAll('a.nav-link').at(2).attributes('href')).toEqual(
           'https://docs.google.com/document/d/1kcX1guOi6tDgnFHD9tf7fB_MneKTx-0nHJxzdN8ygNs/edit?usp=sharing',
         )
       })
 
       it('links to the support', () => {
-        expect(wrapper.findAll('a.nav-link').at(4).attributes('href')).toEqual(
+        expect(wrapper.findAll('a.nav-link').at(3).attributes('href')).toEqual(
           'https://gradido.net/en/contact/',
         )
       })
@@ -142,20 +132,14 @@ describe('ContentFooter', () => {
           )
         })
 
-        it('links to the German elopage when locale is de', () => {
-          expect(wrapper.findAll('a.nav-link').at(2).attributes('href')).toEqual(
-            'https://elopage.com/s/gradido/sign_in?locale=de',
-          )
-        })
-
         it('links to the German whitepaper when locale is de', () => {
-          expect(wrapper.findAll('a.nav-link').at(3).attributes('href')).toEqual(
+          expect(wrapper.findAll('a.nav-link').at(2).attributes('href')).toEqual(
             'https://docs.google.com/document/d/1jZp-DiiMPI9ZPNXmjsvOQ1BtnfDFfx8BX7CDmA8KKjY/edit?usp=sharing',
           )
         })
 
         it('links to the German support-page when locale is de', () => {
-          expect(wrapper.findAll('a.nav-link').at(4).attributes('href')).toEqual(
+          expect(wrapper.findAll('a.nav-link').at(3).attributes('href')).toEqual(
             'https://gradido.net/de/contact/',
           )
         })
diff --git a/frontend/src/components/ContentFooter.vue b/frontend/src/components/ContentFooter.vue
index bdcb5b1a9..c563cc23d 100755
--- a/frontend/src/components/ContentFooter.vue
+++ b/frontend/src/components/ContentFooter.vue
@@ -34,12 +34,6 @@
           <b-nav-item :href="`https://gradido.net/${$i18n.locale}/datenschutz/`" target="_blank">
             {{ $t('footer.privacy_policy') }}
           </b-nav-item>
-          <b-nav-item
-            :href="`https://elopage.com/s/gradido/sign_in?locale=${$i18n.locale}`"
-            target="_blank"
-          >
-            {{ $t('navigation.members_area') }}
-          </b-nav-item>
           <b-nav-item
             :href="
               $i18n.locale === 'de'
diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js
index ebf9abba0..109190e39 100644
--- a/frontend/src/components/Menu/Navbar.spec.js
+++ b/frontend/src/components/Menu/Navbar.spec.js
@@ -17,7 +17,7 @@ const mocks = {
   $t: jest.fn((t) => t),
   $store: {
     state: {
-      hasElopage: false,
+      hasElopage: true,
       isAdmin: true,
     },
   },
@@ -39,13 +39,15 @@ describe('Navbar', () => {
       expect(wrapper.find('div.component-navbar').exists()).toBeTruthy()
     })
 
-    describe('navigation Navbar', () => {
+    describe('navigation Navbar (general elements)', () => {
       it('has .navbar-brand in the navbar', () => {
         expect(wrapper.find('.navbar-brand').exists()).toBeTruthy()
       })
+
       it('has b-navbar-toggle in the navbar', () => {
         expect(wrapper.find('.navbar-toggler').exists()).toBeTruthy()
       })
+
       it('has ten b-nav-item in the navbar', () => {
         expect(wrapper.findAll('.nav-item')).toHaveLength(10)
       })
@@ -57,16 +59,21 @@ describe('Navbar', () => {
       it('has first nav-item "navigation.overview" in navbar', () => {
         expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('navigation.overview')
       })
+
       it('has first nav-item "navigation.send" in navbar', () => {
         expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('navigation.send')
       })
+
       it('has first nav-item "navigation.transactions" in navbar', () => {
         expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.transactions')
       })
+
       it('has first nav-item "navigation.profile" in navbar', () => {
         expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.profile')
       })
+    })
 
+    describe('navigation Navbar (user has an elopage account)', () => {
       it('has a link to the members area', () => {
         expect(wrapper.findAll('.nav-item').at(7).text()).toContain('navigation.members_area')
         expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe(
@@ -77,11 +84,28 @@ describe('Navbar', () => {
       it('has first nav-item "navigation.admin_area" in navbar', () => {
         expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('navigation.admin_area')
       })
+
       it('has first nav-item "navigation.logout" in navbar', () => {
         expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('navigation.logout')
       })
     })
+
+    describe('navigation Navbar (user has no elopage account)', () => {
+      beforeAll(() => {
+        mocks.$store.state.hasElopage = false
+        wrapper = Wrapper()
+      })
+
+      it('has first nav-item "navigation.admin_area" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.admin_area')
+      })
+
+      it('has first nav-item "navigation.logout" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('navigation.logout')
+      })
+    })
   })
+
   describe('check watch visible true', () => {
     beforeEach(async () => {
       await wrapper.setProps({ visible: true })
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 2f26f381e..1c49a1aa3 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -57,7 +57,7 @@
           {{ $t('navigation.profile') }}
         </b-nav-item>
         <br />
-        <b-nav-item :href="elopageUri" class="mb-3" target="_blank">
+        <b-nav-item v-if="$store.state.hasElopage" :href="elopageUri" class="mb-3" target="_blank">
           <b-icon icon="link45deg" aria-hidden="true"></b-icon>
           {{ $t('navigation.members_area') }}
           <b-badge v-if="!$store.state.hasElopage" pill variant="danger">
diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index f6051c733..1593a79a8 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -27,15 +27,12 @@ describe('Sidebar', () => {
     beforeEach(() => {
       wrapper = Wrapper()
     })
+
     it('renders the component', () => {
       expect(wrapper.find('div#component-sidebar').exists()).toBeTruthy()
     })
 
-    describe('navigation Navbar', () => {
-      it('has seven b-nav-item in the navbar', () => {
-        expect(wrapper.findAll('.nav-item')).toHaveLength(8)
-      })
-
+    describe('navigation Navbar (general elements)', () => {
       it('has first nav-item "navigation.overview" in navbar', () => {
         expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('navigation.overview')
       })
@@ -55,6 +52,12 @@ describe('Sidebar', () => {
       it('has first nav-item "navigation.profile" in navbar', () => {
         expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('navigation.profile')
       })
+    })
+
+    describe('navigation Navbar (user has an elopage account)', () => {
+      it('has eight b-nav-item in the navbar', () => {
+        expect(wrapper.findAll('.nav-item')).toHaveLength(8)
+      })
 
       it('has a link to the members area', () => {
         expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.members_area')
@@ -69,5 +72,24 @@ describe('Sidebar', () => {
         expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.logout')
       })
     })
+
+    describe('navigation Navbar (user has no elopage account)', () => {
+      beforeAll(() => {
+        mocks.$store.state.hasElopage = false
+        wrapper = Wrapper()
+      })
+
+      it('has seven b-nav-item in the navbar', () => {
+        expect(wrapper.findAll('.nav-item')).toHaveLength(7)
+      })
+
+      it('has first nav-item "navigation.admin_area" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.admin_area')
+      })
+
+      it('has first nav-item "navigation.logout" in navbar', () => {
+        expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.logout')
+      })
+    })
   })
 })
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index b54eb541e..0cdab31c3 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -27,7 +27,12 @@
         </b-nav>
         <hr />
         <b-nav vertical class="w-100">
-          <b-nav-item class="mb-3" :href="elopageUri" target="_blank">
+          <b-nav-item
+            v-if="$store.state.hasElopage"
+            class="mb-3"
+            :href="elopageUri"
+            target="_blank"
+          >
             <b-icon icon="link45deg" aria-hidden="true"></b-icon>
             {{ $t('navigation.members_area') }}
             <b-badge v-if="!$store.state.hasElopage" pill variant="danger">