diff --git a/frontend/src/components/CommunitySwitch.vue b/frontend/src/components/CommunitySwitch.vue
index 2c47dd08e..eda344c05 100644
--- a/frontend/src/components/CommunitySwitch.vue
+++ b/frontend/src/components/CommunitySwitch.vue
@@ -42,7 +42,7 @@ export default {
     },
     setDefaultCommunity() {
       // when we already get an identifier via url we choose this if the community exist
-      if (this.communityIdentifier) {
+      if (this.communityIdentifier && this.communities.length >= 1) {
         const foundCommunity = this.communities.find((community) => {
           if (
             community.uuid === this.communityIdentifier ||
@@ -82,6 +82,9 @@ export default {
   updated() {
     this.setDefaultCommunity()
   },
+  mounted() {
+    this.setDefaultCommunity()
+  },
 }
 </script>
 <style>
diff --git a/frontend/src/components/GddSend/TransactionForm.spec.js b/frontend/src/components/GddSend/TransactionForm.spec.js
index c7333175c..3065063bf 100644
--- a/frontend/src/components/GddSend/TransactionForm.spec.js
+++ b/frontend/src/components/GddSend/TransactionForm.spec.js
@@ -4,7 +4,7 @@ import flushPromises from 'flush-promises'
 import { SEND_TYPES } from '@/pages/Send'
 import { createMockClient } from 'mock-apollo-client'
 import VueApollo from 'vue-apollo'
-import { userAndCommunity, selectCommunities as selectCommunitiesQuery } from '@/graphql/queries'
+import { user, selectCommunities as selectCommunitiesQuery } from '@/graphql/queries'
 
 const mockClient = createMockClient()
 const apolloProvider = new VueApollo({
@@ -47,23 +47,21 @@ describe('TransactionForm', () => {
     })
   }
 
-  const userAndCommunityMock = jest.fn()
+  const userMock = jest.fn()
 
   mockClient.setRequestHandler(
-    userAndCommunity,
-    userAndCommunityMock
-      .mockRejectedValueOnce({ message: 'Query user name fails!' })
-      .mockResolvedValue({
-        data: {
-          user: {
-            firstName: 'Bibi',
-            lastName: 'Bloxberg',
-          },
-          community: {
-            name: 'Gradido Entwicklung',
-          },
+    user,
+    userMock.mockRejectedValueOnce({ message: 'Query user name fails!' }).mockResolvedValue({
+      data: {
+        user: {
+          firstName: 'Bibi',
+          lastName: 'Bloxberg',
         },
-      }),
+        community: {
+          name: 'Gradido Entwicklung',
+        },
+      },
+    }),
   )
 
   mockClient.setRequestHandler(
@@ -410,7 +408,8 @@ Die ganze Welt bezwingen.“`)
     describe('with gradido ID', () => {
       beforeEach(async () => {
         jest.clearAllMocks()
-        mocks.$route.query.gradidoID = 'gradido-ID'
+        mocks.$route.params.userIdentifier = 'gradido-ID'
+        mocks.$route.params.communityIdentifier = 'community-ID'
         wrapper = Wrapper()
         await wrapper.vm.$nextTick()
       })
@@ -421,8 +420,9 @@ Die ganze Welt bezwingen.“`)
         })
 
         it('queries the username', () => {
-          expect(userAndCommunityMock).toBeCalledWith({
+          expect(userMock).toBeCalledWith({
             identifier: 'gradido-ID',
+            communityIdentifier: 'community-ID',
           })
         })
       })
diff --git a/frontend/src/components/TransactionRows/Name.spec.js b/frontend/src/components/TransactionRows/Name.spec.js
index 99e586fde..a8950b926 100644
--- a/frontend/src/components/TransactionRows/Name.spec.js
+++ b/frontend/src/components/TransactionRows/Name.spec.js
@@ -47,7 +47,12 @@ describe('Name', () => {
     describe('with linked user', () => {
       beforeEach(async () => {
         await wrapper.setProps({
-          linkedUser: { firstName: 'Bibi', lastName: 'Bloxberg', gradidoID: 'gradido-ID' },
+          linkedUser: {
+            firstName: 'Bibi',
+            lastName: 'Bloxberg',
+            gradidoID: 'gradido-ID',
+            communityUuid: 'community UUID',
+          },
         })
       })
 
@@ -70,10 +75,11 @@ describe('Name', () => {
           })
         })
 
-        it('pushes query for gradidoID', () => {
+        it('pushes params for gradidoID and community UUID', () => {
           expect(routerPushMock).toBeCalledWith({
-            query: {
-              gradidoID: 'gradido-ID',
+            params: {
+              communityIdentifier: 'community UUID',
+              userIdentifier: 'gradido-ID',
             },
           })
         })
diff --git a/frontend/src/components/TransactionRows/Name.vue b/frontend/src/components/TransactionRows/Name.vue
index 2f495756c..cc045514e 100644
--- a/frontend/src/components/TransactionRows/Name.vue
+++ b/frontend/src/components/TransactionRows/Name.vue
@@ -37,9 +37,9 @@ export default {
     async tunnelEmail() {
       if (this.$route.path !== '/send') await this.$router.push({ path: '/send' })
       this.$router.push({
-        query: {
-          gradidoID: this.linkedUser.gradidoID,
-          communityUuid: this.linkedUser.communityUuid,
+        params: {
+          userIdentifier: this.linkedUser.gradidoID,
+          communityIdentifier: this.linkedUser.communityUuid,
         },
       })
     },
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 511685efa..f50594d1d 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -29,6 +29,7 @@ describe('Login', () => {
       commit: mockStoreCommit,
       state: {
         publisherId: 12345,
+        redirectPath: '/overview',
       },
     },
     $loading: {
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 6e0a50949..79551095c 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -106,7 +106,7 @@ export default {
           if (this.$route.params.code) {
             this.$router.push(`/redeem/${this.$route.params.code}`)
           } else {
-            this.$router.push('/overview')
+            this.$router.push(this.$store.state.redirectPath)
           }
         })
         .catch((error) => {
diff --git a/frontend/src/pages/Send.spec.js b/frontend/src/pages/Send.spec.js
index 9427e32f8..43bda6f3d 100644
--- a/frontend/src/pages/Send.spec.js
+++ b/frontend/src/pages/Send.spec.js
@@ -38,6 +38,7 @@ describe('Send', () => {
     },
     $route: {
       query: {},
+      params: {},
     },
     $router: {
       push: routerPushMock,
@@ -175,7 +176,9 @@ describe('Send', () => {
 
     describe('with gradidoID query', () => {
       beforeEach(() => {
-        mocks.$route.query.gradidoID = 'gradido-ID'
+        jest.clearAllMocks()
+        mocks.$route.params.userIdentifier = 'gradido-ID'
+        mocks.$route.params.communityIdentifier = 'community-ID'
         wrapper = Wrapper()
       })
 
@@ -226,11 +229,7 @@ describe('Send', () => {
           })
 
           it('resets the gradido ID query in route', () => {
-            expect(routerPushMock).toBeCalledWith({
-              query: {
-                gradidoID: undefined,
-              },
-            })
+            expect(routerPushMock).toBeCalledWith('send')
           })
         })
       })
diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js
index 1838fa0fc..8796fe103 100644
--- a/frontend/src/routes/guards.js
+++ b/frontend/src/routes/guards.js
@@ -36,6 +36,8 @@ const addNavigationGuards = (router, store, apollo) => {
   // handle authentication
   router.beforeEach((to, from, next) => {
     if (to.meta.requiresAuth && !store.state.token) {
+      // store redirect path
+      store.commit('redirectPath', to.path)
       next({ path: '/login' })
     } else {
       next()
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index ab133d842..6d7e7b2a0 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -66,11 +66,11 @@ describe('router', () => {
 
       describe('send', () => {
         it('requires authorization', () => {
-          expect(routes.find((r) => r.path === '/send').meta.requiresAuth).toBeTruthy()
+          expect(routes.find((r) => r.path.startsWith('/send')).meta.requiresAuth).toBeTruthy()
         })
 
         it('loads the "Send" page', async () => {
-          const component = await routes.find((r) => r.path === '/send').component()
+          const component = await routes.find((r) => r.path.startsWith('/send')).component()
           expect(component.default.name).toBe('Send')
         })
       })
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index f11b27593..f56c8dcb5 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -58,6 +58,9 @@ export const mutations = {
   setDarkMode: (state, darkMode) => {
     state.darkMode = !!darkMode
   },
+  redirectPath: (state, redirectPath) => {
+    state.redirectPath = redirectPath || '/overview'
+  },
 }
 
 export const actions = {
@@ -89,6 +92,7 @@ export const actions = {
     commit('hideAmountGDT', true)
     commit('email', '')
     commit('setDarkMode', false)
+    commit('redirectPath', '/overview')
     localStorage.clear()
   },
 }
@@ -119,6 +123,7 @@ try {
       hideAmountGDT: null,
       email: '',
       darkMode: false,
+      redirectPath: '/overview',
     },
     getters: {},
     // Syncronous mutation of the state
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index 6a765cc3f..c6b3d88ab 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -264,7 +264,7 @@ describe('Vuex store', () => {
 
       it('calls twelve commits', () => {
         logout({ commit, state })
-        expect(commit).toHaveBeenCalledTimes(13)
+        expect(commit).toHaveBeenCalledTimes(14)
       })
 
       it('commits token', () => {