diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 55e28db4b..08ecc0379 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -248,7 +248,7 @@ jobs:
       ##########################################################################
       - name: Nginx | Build `production` image
         run: |
-          docker build -t "gradido/nginx:latest" -t "gradido/nginx:production" -t "gradido/nginx:${VERSION}" -t "gradido/nginx:${BUILD_VERSION}" -f ./nginx/Dockerfile ./
+          docker build -t "gradido/nginx:latest" -t "gradido/nginx:production" -t "gradido/nginx:${VERSION}" -t "gradido/nginx:${BUILD_VERSION}" nginx/
           docker save "gradido/nginx" > /tmp/nginx.tar
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 15a736630..5dbbf685f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -199,7 +199,7 @@ jobs:
       ##########################################################################
       - name: nginx | Build `test` image
         run: |
-          docker build -t "gradido/nginx:test" -f ./nginx/Dockerfile ./
+          docker build -t "gradido/nginx:test" nginx/
           docker save "gradido/nginx:test" > /tmp/nginx.tar
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
@@ -470,7 +470,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 76
+          min_coverage: 77
           token: ${{ github.token }}
 
   ##############################################################################
@@ -520,7 +520,7 @@ jobs:
           report_name: Coverage Backend
           type: lcov
           result_path: ./backend/coverage/lcov.info
-          min_coverage: 40
+          min_coverage: 45
           token: ${{ github.token }}
 
   ##############################################################################
diff --git a/.gitignore b/.gitignore
index 5682953d4..b02b9d6ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,9 @@ nbproject
 .metadata
 /.env
 package-lock.json
+/deployment/bare_metal/.env
+/deployment/bare_metal/nginx/sites-available/gradido.conf
+/deployment/bare_metal/nginx/sites-available/update-page.conf
+/deployment/bare_metal/nginx/update-page/updating.html
+/deployment/bare_metal/log
+/deployment/bare_metal/backup
diff --git a/README.md b/README.md
index ce8e84df0..355a40b82 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ We are currently restructuring the service to reduce dependencies and unify busi
 
 ### Open the wallet
 
-Once you have `docker-compose` up and running, you can open [http://localhost/vue](http://localhost/vue) and create yourself a new wallet account.
+Once you have `docker-compose` up and running, you can open [http://localhost/](http://localhost/) and create yourself a new wallet account.
 
 ## How to release
 
@@ -90,7 +90,7 @@ Note: The Changelog will be regenerated with all tags on release on the external
 | Problem | Issue | Solution | Description |
 | ------- | ----- | -------- | ----------- |
 | docker-compose raises database connection errors | [#1062](https://github.com/gradido/gradido/issues/1062) | End `ctrl+c` and restart the `docker-compose up` after a successful build | Several Database connection related errors occur in the docker-compose log. |
-| Wallet page is empty | [#1063](https://github.com/gradido/gradido/issues/1063) | Accept Cookies and Local Storage in your Browser | The page stays empty when navigating to [http://localhost/vue](http://localhost/vue) |
+| Wallet page is empty | [#1063](https://github.com/gradido/gradido/issues/1063) | Accept Cookies and Local Storage in your Browser | The page stays empty when navigating to [http://localhost/](http://localhost/) |
 
 ## Useful Links
 
diff --git a/admin/.env.dist b/admin/.env.dist
index 6d78e6782..66c84dda8 100644
--- a/admin/.env.dist
+++ b/admin/.env.dist
@@ -1,3 +1,4 @@
 GRAPHQL_URI=http://localhost:4000/graphql
-WALLET_AUTH_URL=http://localhost/vue/authenticate?token=$1
+WALLET_AUTH_URL=http://localhost/authenticate?token={token}
+WALLET_URL=http://localhost/login
 DEBUG_DISABLE_AUTH=false
\ No newline at end of file
diff --git a/admin/.env.template b/admin/.env.template
new file mode 100644
index 000000000..a965b1bb1
--- /dev/null
+++ b/admin/.env.template
@@ -0,0 +1,4 @@
+GRAPHQL_URI=$GRAPHQL_URI
+WALLET_AUTH_URL=$WALLET_AUTH_URL
+WALLET_URL=$WALLET_URL
+DEBUG_DISABLE_AUTH=false
\ No newline at end of file
diff --git a/admin/package.json b/admin/package.json
index c94d0a2b0..93fbed8ae 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -33,6 +33,7 @@
     "core-js": "^3.6.5",
     "dotenv-webpack": "^7.0.3",
     "graphql": "^15.6.1",
+    "express": "^4.17.1",
     "identity-obj-proxy": "^3.0.0",
     "jest": "26.6.3",
     "moment": "^2.29.1",
diff --git a/admin/run/server.js b/admin/run/server.js
index 97a525427..bccefc65c 100644
--- a/admin/run/server.js
+++ b/admin/run/server.js
@@ -1,15 +1,21 @@
 // Imports
 const express = require('express')
-const serveStatic = require('serve-static')
+const path = require('path')
 
-// Port
+// Host & Port
+const hostname = '127.0.0.1'
 const port = process.env.PORT || 8080
 
 // Express Server
 const app = express()
-// eslint-disable-next-line node/no-path-concat
-app.use(serveStatic(__dirname + '/../dist'))
-app.listen(port)
+// Serve files
+app.use(express.static(path.join(__dirname, '../dist')))
+// Default to index.html
+app.get('*', (req, res) => {
+  res.sendFile(path.join(__dirname, '../dist/index.html'))
+})
 
-// eslint-disable-next-line no-console
-console.log(`http://admin:${port} server started.`)
+app.listen(port, hostname, () => {
+  // eslint-disable-next-line no-console
+  console.log('Listening at http://%s:%s/', hostname, port)
+})
diff --git a/admin/src/components/ConfirmRegisterMailFormular.spec.js b/admin/src/components/ConfirmRegisterMailFormular.spec.js
index 705a185a3..78f5791dc 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.spec.js
+++ b/admin/src/components/ConfirmRegisterMailFormular.spec.js
@@ -19,6 +19,7 @@ const mocks = {
 }
 
 const propsData = {
+  checked: false,
   email: 'bob@baumeister.de',
   dateLastSend: '',
 }
diff --git a/admin/src/components/ConfirmRegisterMailFormular.vue b/admin/src/components/ConfirmRegisterMailFormular.vue
index 5052a8a3e..635b80939 100644
--- a/admin/src/components/ConfirmRegisterMailFormular.vue
+++ b/admin/src/components/ConfirmRegisterMailFormular.vue
@@ -1,19 +1,20 @@
 <template>
   <div class="component-confirm-register-mail">
     <div class="shadow p-3 mb-5 bg-white rounded">
-      <div class="h5">
-        {{ $t('unregister_mail.text', { date: dateLastSend, mail: email }) }}
-      </div>
+      <div v-if="checked">{{ $t('unregister_mail.text_true', { date: dateLastSend }) }}</div>
+      <div v-else>
+        {{ $t('unregister_mail.text_false', { date: dateLastSend, mail: email }) }}
 
-      <!-- Using components -->
-      <b-input-group :prepend="$t('unregister_mail.info')" class="mt-3">
-        <b-form-input readonly :value="email"></b-form-input>
-        <b-input-group-append>
-          <b-button variant="outline-success" class="test-button" @click="sendRegisterMail">
-            {{ $t('unregister_mail.button') }}
-          </b-button>
-        </b-input-group-append>
-      </b-input-group>
+        <!-- Using components -->
+        <b-input-group :prepend="$t('unregister_mail.info')" class="mt-3">
+          <b-form-input readonly :value="email"></b-form-input>
+          <b-input-group-append>
+            <b-button variant="outline-success" class="test-button" @click="sendRegisterMail">
+              {{ $t('unregister_mail.button') }}
+            </b-button>
+          </b-input-group-append>
+        </b-input-group>
+      </div>
     </div>
   </div>
 </template>
@@ -23,6 +24,9 @@ import { sendActivationEmail } from '../graphql/sendActivationEmail'
 export default {
   name: 'ConfirmRegisterMail',
   props: {
+    checked: {
+      type: Boolean,
+    },
     email: {
       type: String,
     },
diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js
index 388ab6aa9..5b0ac09f5 100644
--- a/admin/src/components/CreationFormular.spec.js
+++ b/admin/src/components/CreationFormular.spec.js
@@ -99,7 +99,10 @@ describe('CreationFormular', () => {
       describe('with mass creation', () => {
         beforeEach(async () => {
           jest.clearAllMocks()
-          await wrapper.setProps({ type: 'massCreation' })
+          await wrapper.setProps({ type: 'massCreation', creation: [200, 400, 600] })
+          await wrapper.setData({ rangeMin: 180 })
+          await wrapper.setData({ text: 'Test create coins' })
+          await wrapper.setData({ value: 90 })
         })
 
         describe('first radio button', () => {
diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue
index af966a952..49993d14a 100644
--- a/admin/src/components/CreationFormular.vue
+++ b/admin/src/components/CreationFormular.vue
@@ -123,6 +123,7 @@
 <script>
 import { verifyLogin } from '../graphql/verifyLogin'
 import { createPendingCreation } from '../graphql/createPendingCreation'
+import { createPendingCreations } from '../graphql/createPendingCreations'
 export default {
   name: 'CreationFormular',
   props: {
@@ -207,24 +208,45 @@ export default {
     submitCreation() {
       if (this.type === 'massCreation') {
         // Die anzahl der Mitglieder aus der Mehrfachschöpfung
-        const i = Object.keys(this.itemsMassCreation).length
+        const i = Object.keys(this.items).length
         // hinweis das eine Mehrfachschöpfung ausgeführt wird an (Anzahl der MItgleider an die geschöpft wird)
-        this.submitObj = [
-          {
-            item: this.itemsMassCreation,
-            email: this.item.email,
+        // eslint-disable-next-line no-console
+        console.log('SUBMIT CREATION => ' + this.type + ' >> für VIELE ' + i + ' Mitglieder')
+        this.submitObj = []
+        this.items.forEach((item) => {
+          this.submitObj.push({
+            email: item.email,
             creationDate: this.radioSelected.long,
-            amount: this.value,
+            amount: Number(this.value),
             memo: this.text,
-            moderator: this.$store.state.moderator.id,
-          },
-        ]
-
-        // $store - offene Schöpfungen hochzählen
-        this.$store.commit('openCreationsPlus', i)
-
-        // lösche alle Mitglieder aus der MehrfachSchöpfungsListe nach dem alle Mehrfachschpfungen zum bestätigen gesendet wurden.
-        this.$emit('remove-all-bookmark')
+            moderator: Number(this.$store.state.moderator.id),
+          })
+        })
+        // eslint-disable-next-line no-console
+        console.log('MehrfachSCHÖPFUNG ABSENDEN FÜR >> ' + i + ' Mitglieder')
+        this.$apollo
+          .mutate({
+            mutation: createPendingCreations,
+            variables: {
+              pendingCreations: this.submitObj,
+            },
+            fetchPolicy: 'no-cache',
+          })
+          .then((result) => {
+            this.$store.commit(
+              'openCreationsPlus',
+              result.data.createPendingCreations.successfulCreation.length,
+            )
+            if (result.data.createPendingCreations.failedCreation.length > 0) {
+              result.data.createPendingCreations.failedCreation.forEach((failed) => {
+                this.$toasted.error('Could not created PendingCreation for ' + failed)
+              })
+            }
+            this.$emit('remove-all-bookmark')
+          })
+          .catch((error) => {
+            this.$toasted.error(error.message)
+          })
       } else if (this.type === 'singleCreation') {
         this.submitObj = {
           email: this.item.email,
diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js
index 9817d6b8f..32dcb6c9d 100644
--- a/admin/src/components/CreationTransactionListFormular.spec.js
+++ b/admin/src/components/CreationTransactionListFormular.spec.js
@@ -8,7 +8,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
     transactionList: {
       transactions: [
         {
-          type: 'created',
+          type: 'creation',
           balance: 100,
           decayStart: 0,
           decayEnd: 0,
@@ -27,7 +27,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
           },
         },
         {
-          type: 'created',
+          type: 'creation',
           balance: 200,
           decayStart: 0,
           decayEnd: 0,
@@ -58,9 +58,7 @@ const mocks = {
     query: apolloQueryMock,
   },
   $toasted: {
-    global: {
-      error: toastedErrorMock,
-    },
+    error: toastedErrorMock,
   },
 }
 
diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue
index 09e1fa92a..7fed4adcc 100644
--- a/admin/src/components/CreationTransactionListFormular.vue
+++ b/admin/src/components/CreationTransactionListFormular.vue
@@ -30,10 +30,10 @@ export default {
           },
         })
         .then((result) => {
-          this.items = result.data.transactionList.transactions
+          this.items = result.data.transactionList.transactions.filter((t) => t.type === 'creation')
         })
         .catch((error) => {
-          this.$toasted.global.error(error.message)
+          this.$toasted.error(error.message)
         })
     },
   },
diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js
index 92ef20988..ed0f412ba 100644
--- a/admin/src/components/EditCreationFormular.spec.js
+++ b/admin/src/components/EditCreationFormular.spec.js
@@ -16,6 +16,7 @@ const apolloMutateMock = jest.fn().mockResolvedValue({
 
 const stateCommitMock = jest.fn()
 const toastedErrorMock = jest.fn()
+const toastedSuccessMock = jest.fn()
 
 const mocks = {
   $t: jest.fn((t) => t),
@@ -43,6 +44,7 @@ const mocks = {
   },
   $toasted: {
     error: toastedErrorMock,
+    success: toastedSuccessMock,
   },
 }
 
@@ -53,6 +55,10 @@ const propsData = {
     amount: 100,
     date: '2021-12-01',
   },
+  item: {
+    id: 0,
+    email: 'bob@baumeister.de',
+  },
 }
 
 describe('EditCreationFormular', () => {
@@ -109,8 +115,8 @@ describe('EditCreationFormular', () => {
                   variables: {
                     amount: 90,
                     creationDate: 'YYYY-MM-01',
-                    email: undefined,
-                    id: undefined,
+                    email: 'bob@baumeister.de',
+                    id: 0,
                     memo: 'Test create coins',
                     moderator: 0,
                   },
@@ -118,6 +124,23 @@ describe('EditCreationFormular', () => {
               )
             })
 
+            it('emits update-user-data', () => {
+              expect(wrapper.emitted('update-user-data')).toBeTruthy()
+              expect(wrapper.emitted('update-user-data')).toEqual([
+                [
+                  {
+                    id: 0,
+                    email: 'bob@baumeister.de',
+                  },
+                  [0, 0, 0],
+                ],
+              ])
+            })
+
+            it('toast success message', () => {
+              expect(toastedSuccessMock).toBeCalledWith('creation_form.toasted_update')
+            })
+
             describe('sendForm with error', () => {
               beforeEach(async () => {
                 jest.clearAllMocks()
@@ -164,8 +187,8 @@ describe('EditCreationFormular', () => {
                   variables: {
                     amount: 90,
                     creationDate: 'YYYY-MM-01',
-                    email: undefined,
-                    id: undefined,
+                    email: 'bob@baumeister.de',
+                    id: 0,
                     memo: 'Test create coins',
                     moderator: 0,
                   },
@@ -220,8 +243,8 @@ describe('EditCreationFormular', () => {
                   variables: {
                     amount: 90,
                     creationDate: 'YYYY-MM-DD',
-                    email: undefined,
-                    id: undefined,
+                    email: 'bob@baumeister.de',
+                    id: 0,
                     memo: 'Test create coins',
                     moderator: 0,
                   },
diff --git a/admin/src/components/EditCreationFormular.vue b/admin/src/components/EditCreationFormular.vue
index b255a5662..172ae5509 100644
--- a/admin/src/components/EditCreationFormular.vue
+++ b/admin/src/components/EditCreationFormular.vue
@@ -129,10 +129,7 @@ export default {
   props: {
     item: {
       type: Object,
-      required: false,
-      default() {
-        return {}
-      },
+      required: true,
     },
     row: {
       type: Object,
@@ -143,10 +140,7 @@ export default {
     },
     creationUserData: {
       type: Object,
-      required: false,
-      default() {
-        return {}
-      },
+      required: true,
     },
     creation: {
       type: Array,
diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js
index 6871cb4f7..b084dd18b 100644
--- a/admin/src/components/NavBar.spec.js
+++ b/admin/src/components/NavBar.spec.js
@@ -53,13 +53,17 @@ describe('NavBar', () => {
   })
 
   describe('logout', () => {
-    // const assignLocationSpy = jest.fn()
+    const windowLocationMock = jest.fn()
     beforeEach(async () => {
+      delete window.location
+      window.location = {
+        assign: windowLocationMock,
+      }
       await wrapper.findAll('a').at(6).trigger('click')
     })
 
     it('redirects to /logout', () => {
-      expect(routerPushMock).toBeCalledWith('/logout')
+      expect(windowLocationMock).toBeCalledWith('http://localhost/login')
     })
 
     it('dispatches logout to store', () => {
diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue
index 03ace0335..0e8ad8acf 100644
--- a/admin/src/components/NavBar.vue
+++ b/admin/src/components/NavBar.vue
@@ -33,11 +33,12 @@ export default {
   name: 'navbar',
   methods: {
     logout() {
+      window.location.assign(CONFIG.WALLET_URL)
+      // window.location = CONFIG.WALLET_URL
       this.$store.dispatch('logout')
-      this.$router.push('/logout')
     },
     wallet() {
-      window.location = CONFIG.WALLET_AUTH_URL.replace('$1', this.$store.state.token)
+      window.location = CONFIG.WALLET_AUTH_URL.replace('{token}', this.$store.state.token)
       this.$store.dispatch('logout') // logout without redirect
     },
   },
diff --git a/admin/src/components/UserTable.spec.js b/admin/src/components/UserTable.spec.js
index e25f53015..e26a548cc 100644
--- a/admin/src/components/UserTable.spec.js
+++ b/admin/src/components/UserTable.spec.js
@@ -3,31 +3,287 @@ import UserTable from './UserTable.vue'
 
 const localVue = global.localVue
 
+const apolloQueryMock = jest.fn()
+apolloQueryMock.mockResolvedValue()
+
 describe('UserTable', () => {
   let wrapper
 
-  const propsData = {
-    type: 'Type',
-    itemsUser: [],
-    fieldsTable: [],
-    creation: [],
+  const defaultItemsUser = [
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      creation: [1000, 1000, 1000],
+    },
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      creation: [1000, 1000, 1000],
+    },
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      creation: [1000, 1000, 1000],
+    },
+  ]
+
+  const confirmationItemsUser = [
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      amount: 10,
+      memo: 'Test 1',
+      date: '11-09-2001',
+      moderator: 1,
+    },
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      amount: 10,
+      memo: 'Test 2',
+      date: '21-09-2001',
+      moderator: 1,
+    },
+    {
+      email: 'bibi@bloxberg.de',
+      firstName: 'Bibi',
+      lastName: 'Bloxberg',
+      amount: 10,
+      memo: 'Test 3',
+      date: '30-09-2001',
+      moderator: 1,
+    },
+  ]
+
+  const propsDataPageUserSearch = {
+    type: 'PageUserSearch',
+    itemsUser: defaultItemsUser,
+    fieldsTable: [
+      'email',
+      'firstName',
+      'lastName',
+      'creation',
+      'show_details',
+      'confirm_mail',
+      'transactions_list',
+    ],
+  }
+
+  const propsDataUserListSearch = {
+    type: 'UserListSearch',
+    itemsUser: defaultItemsUser,
+    fieldsTable: ['bookmark', 'email', 'firstName', 'lastName', 'creation'],
+    creation: [1000, 1000, 1000],
+  }
+
+  const propsDataUserListMassCreation = {
+    type: 'UserListMassCreation',
+    itemsUser: defaultItemsUser,
+    fieldsTable: ['email', 'firstName', 'lastName', 'creation', 'bookmark'],
+    creation: [1000, 1000, 1000],
+  }
+
+  const propsDataPageCreationConfirm = {
+    type: 'PageCreationConfirm',
+    itemsUser: confirmationItemsUser,
+    fieldsTable: [
+      'bookmark',
+      'email',
+      'firstName',
+      'lastName',
+      'amount',
+      'memo',
+      'date',
+      'moderator',
+      'edit_creation',
+      'confirm',
+    ],
   }
 
   const mocks = {
     $t: jest.fn((t) => t),
+    $moment: jest.fn(() => {
+      return {
+        format: jest.fn((m) => m),
+        subtract: jest.fn(() => {
+          return {
+            format: jest.fn((m) => m),
+          }
+        }),
+      }
+    }),
+    $apollo: {
+      query: apolloQueryMock,
+    },
+    $store: {
+      commit: jest.fn(),
+    },
   }
 
-  const Wrapper = () => {
+  const Wrapper = (propsData) => {
     return mount(UserTable, { localVue, propsData, mocks })
   }
 
   describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
+    describe('type PageUserSearch', () => {
+      beforeEach(() => {
+        wrapper = Wrapper(propsDataPageUserSearch)
+      })
+
+      it('has a DIV element with the class.component-user-table', () => {
+        expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+      })
+
+      it('has a DIV element with the id overlay that is not displayed', () => {
+        expect(wrapper.find('#overlay').exists()).toBeTruthy()
+        expect(wrapper.find('#overlay').attributes('style')).toBe('display: none;')
+      })
+
+      describe('table', () => {
+        it('has a table', () => {
+          expect(wrapper.find('table').exists()).toBeTruthy()
+        })
+
+        describe('header definition', () => {
+          it('has 4 column', () => {
+            expect(wrapper.findAll('th').length).toBe(7)
+          })
+
+          it('has Email as first column', () => {
+            expect(wrapper.find('th[aria-colindex="1"] div').text()).toBe('Email')
+          })
+
+          it('has First Name as second column', () => {
+            expect(wrapper.find('th[aria-colindex="2"] div').text()).toBe('First Name')
+          })
+
+          it('has Last Name as third column', () => {
+            expect(wrapper.find('th[aria-colindex="3"] div').text()).toBe('Last Name')
+          })
+
+          it('has Creation as fourth column', () => {
+            expect(wrapper.find('th[aria-colindex="4"] div').text()).toBe('Creation')
+          })
+
+          it('has Creation as fifth column', () => {
+            expect(wrapper.find('th[aria-colindex="5"] div').text()).toBe('Show Details')
+          })
+
+          it('has Creation as sixth column', () => {
+            expect(wrapper.find('th[aria-colindex="6"] div').text()).toBe('Confirm Mail')
+          })
+
+          it('has Creation as seventh column', () => {
+            expect(wrapper.find('th[aria-colindex="7"] div').text()).toBe('Transactions List')
+          })
+        })
+
+        describe('content', () => {
+          it('has 3 rows', () => {
+            expect(wrapper.findAll('tbody tr').length).toBe(3)
+          })
+
+          it('has 7 columns', () => {
+            expect(wrapper.findAll('tr:nth-child(1) > td').length).toBe(7)
+          })
+
+          it('click button on fifth column', () => {
+            wrapper.find('tbody tr td[aria-colindex="5"] button').trigger('click')
+          })
+        })
+      })
+
+      // it('expect(wrapper.html()).', () => {
+      //   // eslint-disable-next-line no-console
+      //   console.log(wrapper.html())
+      // })
     })
 
-    it('has a DIV element with the class.component-user-table', () => {
-      expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+    describe('type UserListSearch', () => {
+      beforeEach(() => {
+        wrapper = Wrapper(propsDataUserListSearch)
+      })
+
+      it('has a DIV element with the class.component-user-table', () => {
+        expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+      })
+
+      // it('expect(wrapper.html()).', () => {
+      //   // eslint-disable-next-line no-console
+      //   console.log(wrapper.html())
+      // })
     })
+
+    describe('type UserListMassCreation', () => {
+      beforeEach(() => {
+        wrapper = Wrapper(propsDataUserListMassCreation)
+      })
+
+      it('has a DIV element with the class.component-user-table', () => {
+        expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+      })
+
+      // it('expect(wrapper.html()).', () => {
+      //   // eslint-disable-next-line no-console
+      //   console.log(wrapper.html())
+      // })
+    })
+
+    describe('type PageCreationConfirm', () => {
+      beforeEach(() => {
+        wrapper = Wrapper(propsDataPageCreationConfirm)
+      })
+
+      it('has a DIV element with the class.component-user-table', () => {
+        expect(wrapper.find('.component-user-table').exists()).toBeTruthy()
+      })
+
+      // it('expect(wrapper.html()).', () => {
+      //   // eslint-disable-next-line no-console
+      //   console.log(wrapper.html())
+      // })
+    })
+    /** 
+    <user-table
+      v-if="itemsList.length > 0"
+      type="UserListSearch"
+      :itemsUser="itemsList"
+      :fieldsTable="Searchfields"
+      :criteria="criteria"
+      :creation="creation"
+      @update-item="updateItem"
+    /> 
+    
+    <user-table
+      v-show="itemsMassCreation.length > 0"
+      class="shadow p-3 mb-5 bg-white rounded"
+      type="UserListMassCreation"
+      :itemsUser="itemsMassCreation"
+      :fieldsTable="fields"
+      :criteria="null"
+      :creation="creation"
+      @update-item="updateItem"
+    />
+    
+    <user-table
+      class="mt-4"
+      type="PageCreationConfirm"
+      :itemsUser="confirmResult"
+      :fieldsTable="fields"
+      @remove-confirm-result="removeConfirmResult"
+    />
+
+    <user-table
+      type="PageUserSearch"
+      :itemsUser="searchResult"
+      :fieldsTable="fields"
+      :criteria="criteria"
+    />
+    */
   })
 })
diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue
index 3f5393412..3f8dface3 100644
--- a/admin/src/components/UserTable.vue
+++ b/admin/src/components/UserTable.vue
@@ -74,6 +74,7 @@
 
       <template #row-details="row">
         <row-details
+          v-if="type !== 'UserListSearch' && type !== 'UserListMassCreation'"
           :row="row"
           :type="type"
           :slotName="slotName"
@@ -107,6 +108,7 @@
           </template>
           <template #show-register-mail>
             <confirm-register-mail-formular
+              :checked="row.item.emailChecked"
               :email="row.item.email"
               :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
             />
@@ -232,6 +234,9 @@ export default {
           row.toggleDetails()
           this.slotIndex = index
           this.openRow = row
+          if (this.type === 'PageCreationConfirm') {
+            this.creationUserData = row.item
+          }
         }
       } else {
         row.toggleDetails()
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 69d30a66a..f7d361c12 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -19,7 +19,8 @@ const environment = {
 
 const endpoints = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
-  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/vue/authenticate?token=$1',
+  WALLET_AUTH_URL: process.env.WALLET_AUTH_URL || 'http://localhost/authenticate?token={token}',
+  WALLET_URL: process.env.WALLET_URL || 'http://localhost/login',
 }
 
 const debug = {
diff --git a/admin/src/graphql/createPendingCreations.js b/admin/src/graphql/createPendingCreations.js
new file mode 100644
index 000000000..95d60bc9a
--- /dev/null
+++ b/admin/src/graphql/createPendingCreations.js
@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const createPendingCreations = gql`
+  mutation ($pendingCreations: [CreatePendingCreationArgs!]!) {
+    createPendingCreations(pendingCreations: $pendingCreations) {
+      success
+      successfulCreation
+      failedCreation
+    }
+  }
+`
diff --git a/admin/src/graphql/searchUsers.js b/admin/src/graphql/searchUsers.js
index cf6225338..2bd6d2004 100644
--- a/admin/src/graphql/searchUsers.js
+++ b/admin/src/graphql/searchUsers.js
@@ -1,14 +1,22 @@
 import gql from 'graphql-tag'
 
 export const searchUsers = gql`
-  query ($searchText: String!) {
-    searchUsers(searchText: $searchText) {
-      userId
-      firstName
-      lastName
-      email
-      creation
-      emailChecked
+  query ($searchText: String!, $currentPage: Int, $pageSize: Int, $notActivated: Boolean) {
+    searchUsers(
+      searchText: $searchText
+      currentPage: $currentPage
+      pageSize: $pageSize
+      notActivated: $notActivated
+    ) {
+      userCount
+      userList {
+        userId
+        firstName
+        lastName
+        email
+        creation
+        emailChecked
+      }
     }
   }
 `
diff --git a/admin/src/graphql/verifyLogin.js b/admin/src/graphql/verifyLogin.js
index 553557f3c..ea08bb5b1 100644
--- a/admin/src/graphql/verifyLogin.js
+++ b/admin/src/graphql/verifyLogin.js
@@ -7,6 +7,7 @@ export const verifyLogin = gql`
       lastName
       isAdmin
       id
+      language
     }
   }
 `
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index b2f0e427d..a9a2bc382 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,8 +1,9 @@
 {
+  "all_emails": "Alle Nutzer",
   "bookmark": "bookmark",
   "confirmed": "bestätigt",
   "creation_form": {
-    "creation_for": "Schöpfung für ",
+    "creation_for": "Schöpfung für",
     "enter_text": "Text eintragen",
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
@@ -53,13 +54,14 @@
   "transactionlist": {
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },
-  "unregistered_emails": "Unregistrierte E-Mails",
+  "unregistered_emails": "Nur unregistrierte Nutzer",
   "unregister_mail": {
     "button": "Registrierungs-Email bestätigen, jetzt senden",
     "error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}",
     "info": "Email bestätigen, wiederholt senden an:",
     "success": "Erfolgreiches Senden des Bestätigungs-Links an die E-Mail des Nutzers! ({email})",
-    "text": " Die letzte Email wurde am <b>{date} Uhr</b> an das Mitglied ({mail}) gesendet."
+    "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({mail}) gesendet.",
+    "text_true": " Die Email wurde am {date} Uhr bestätigt."
   },
   "user_search": "Nutzer-Suche"
 }
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 398f4b5f6..ee2b9b36d 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,8 +1,9 @@
 {
+  "all_emails": "All users",
   "bookmark": "Remember",
   "confirmed": "confirmed",
   "creation_form": {
-    "creation_for": "Creation for ",
+    "creation_for": "Creation for",
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",
@@ -53,13 +54,14 @@
   "transactionlist": {
     "title": "All creation-transactions for the user"
   },
-  "unregistered_emails": "Unregistered e-mails",
+  "unregistered_emails": "Only unregistered users",
   "unregister_mail": {
     "button": "Confirm registration email, send now",
     "error": "Error sending the confirmation link to the user: {message}",
     "info": "Confirm email, send repeatedly to:",
     "success": "Successfully send the confirmation link to the user's email! ({email})",
-    "text": " The last email was sent to the member ({mail}) on <b>{date} clock</b>."
+    "text_false": "The last email was sent to the member ({mail}) on {date} clock.",
+    "text_true": "The email was confirmed on {date} clock."
   },
   "user_search": "User search"
 }
diff --git a/admin/src/main.js b/admin/src/main.js
index 2743e0f9a..c0004beca 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -42,7 +42,7 @@ Vue.use(Toasted, {
   },
 })
 
-addNavigationGuards(router, store, apolloProvider.defaultClient)
+addNavigationGuards(router, store, apolloProvider.defaultClient, i18n)
 
 new Vue({
   moment,
diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js
index 073b22c0e..01a884f54 100644
--- a/admin/src/pages/Creation.spec.js
+++ b/admin/src/pages/Creation.spec.js
@@ -6,22 +6,25 @@ const localVue = global.localVue
 
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
-    searchUsers: [
-      {
-        id: 1,
-        firstName: 'Bibi',
-        lastName: 'Bloxberg',
-        email: 'bibi@bloxberg.de',
-        creation: [200, 400, 600],
-      },
-      {
-        id: 2,
-        firstName: 'Benjamin',
-        lastName: 'Blümchen',
-        email: 'benjamin@bluemchen.de',
-        creation: [800, 600, 400],
-      },
-    ],
+    searchUsers: {
+      userCount: 2,
+      userList: [
+        {
+          userId: 1,
+          firstName: 'Bibi',
+          lastName: 'Bloxberg',
+          email: 'bibi@bloxberg.de',
+          creation: [200, 400, 600],
+        },
+        {
+          userId: 2,
+          firstName: 'Benjamin',
+          lastName: 'Blümchen',
+          email: 'benjamin@bluemchen.de',
+          creation: [800, 600, 400],
+        },
+      ],
+    },
   },
 })
 
@@ -35,6 +38,16 @@ const mocks = {
   $toasted: {
     error: toastErrorMock,
   },
+  $moment: jest.fn(() => {
+    return {
+      format: jest.fn((m) => m),
+      subtract: jest.fn(() => {
+        return {
+          format: jest.fn((m) => m),
+        }
+      }),
+    }
+  }),
 }
 
 describe('Creation', () => {
@@ -61,7 +74,7 @@ describe('Creation', () => {
       it('sets the data of itemsList', () => {
         expect(wrapper.vm.itemsList).toEqual([
           {
-            id: 1,
+            userId: 1,
             firstName: 'Bibi',
             lastName: 'Bloxberg',
             email: 'bibi@bloxberg.de',
@@ -69,7 +82,7 @@ describe('Creation', () => {
             showDetails: false,
           },
           {
-            id: 2,
+            userId: 2,
             firstName: 'Benjamin',
             lastName: 'Blümchen',
             email: 'benjamin@bluemchen.de',
@@ -90,7 +103,7 @@ describe('Creation', () => {
           wrapper.findComponent({ name: 'UserTable' }).vm.$emit(
             'update-item',
             {
-              id: 2,
+              userId: 2,
               firstName: 'Benjamin',
               lastName: 'Blümchen',
               email: 'benjamin@bluemchen.de',
@@ -104,7 +117,7 @@ describe('Creation', () => {
         it('removes the pushed item from itemsList', () => {
           expect(wrapper.vm.itemsList).toEqual([
             {
-              id: 1,
+              userId: 1,
               firstName: 'Bibi',
               lastName: 'Bloxberg',
               email: 'bibi@bloxberg.de',
@@ -117,7 +130,7 @@ describe('Creation', () => {
         it('adds the pushed item to itemsMassCreation', () => {
           expect(wrapper.vm.itemsMassCreation).toEqual([
             {
-              id: 2,
+              userId: 2,
               firstName: 'Benjamin',
               lastName: 'Blümchen',
               email: 'benjamin@bluemchen.de',
@@ -132,7 +145,7 @@ describe('Creation', () => {
             wrapper.findComponent({ name: 'UserTable' }).vm.$emit(
               'update-item',
               {
-                id: 2,
+                userId: 2,
                 firstName: 'Benjamin',
                 lastName: 'Blümchen',
                 email: 'benjamin@bluemchen.de',
@@ -150,7 +163,7 @@ describe('Creation', () => {
           it('adds the item to itemsList', () => {
             expect(wrapper.vm.itemsList).toEqual([
               {
-                id: 1,
+                userId: 1,
                 firstName: 'Bibi',
                 lastName: 'Bloxberg',
                 email: 'bibi@bloxberg.de',
@@ -158,7 +171,7 @@ describe('Creation', () => {
                 showDetails: false,
               },
               {
-                id: 2,
+                userId: 2,
                 firstName: 'Benjamin',
                 lastName: 'Blümchen',
                 email: 'benjamin@bluemchen.de',
@@ -196,7 +209,7 @@ describe('Creation', () => {
         await wrapper.findComponent({ name: 'UserTable' }).vm.$emit(
           'update-item',
           {
-            id: 2,
+            userId: 2,
             firstName: 'Benjamin',
             lastName: 'Blümchen',
             email: 'benjamin@bluemchen.de',
@@ -217,6 +230,22 @@ describe('Creation', () => {
       })
     })
 
+    describe('watchers', () => {
+      beforeEach(() => {
+        jest.clearAllMocks()
+      })
+
+      it('calls API when criteria changes', async () => {
+        await wrapper.setData({ criteria: 'XX' })
+        expect(apolloQueryMock).toBeCalled()
+      })
+
+      it('calls API when currentPage changes', async () => {
+        await wrapper.setData({ currentPage: 2 })
+        expect(apolloQueryMock).toBeCalled()
+      })
+    })
+
     describe('apollo returns error', () => {
       beforeEach(() => {
         apolloQueryMock.mockRejectedValue({
diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue
index 4d6dca920..0de804288 100644
--- a/admin/src/pages/Creation.vue
+++ b/admin/src/pages/Creation.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="creation">
     <b-row>
-      <b-col cols="12" lg="5">
+      <b-col cols="12" lg="6">
         <label>Usersuche</label>
         <b-input
           type="text"
@@ -18,8 +18,15 @@
           :creation="creation"
           @update-item="updateItem"
         />
+        <b-pagination
+          pills
+          v-model="currentPage"
+          per-page="perPage"
+          :total-rows="rows"
+          align="center"
+        ></b-pagination>
       </b-col>
-      <b-col cols="12" lg="7" class="shadow p-3 mb-5 rounded bg-info">
+      <b-col cols="12" lg="6" class="shadow p-3 mb-5 rounded bg-info">
         <user-table
           v-show="itemsMassCreation.length > 0"
           class="shadow p-3 mb-5 bg-white rounded"
@@ -62,14 +69,38 @@ export default {
         { key: 'bookmark', label: 'bookmark' },
         { key: 'firstName', label: this.$t('firstname') },
         { key: 'lastName', label: this.$t('lastname') },
-        { key: 'creation', label: this.$t('open_creations') },
+        {
+          key: 'creation',
+          // label: this.$t('open_creation') + 'Jan | Feb | März',
+          label:
+            this.$moment().subtract(2, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().subtract(1, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().format('MMM'),
+          formatter: (value, key, item) => {
+            return String(value[0]) + ` | ` + String(value[1]) + ` |  ` + String(value[2])
+          },
+        },
         { key: 'email', label: this.$t('e_mail') },
       ],
       fields: [
         { key: 'email', label: this.$t('e_mail') },
         { key: 'firstName', label: this.$t('firstname') },
         { key: 'lastName', label: this.$t('lastname') },
-        { key: 'creation', label: this.$t('open_creations') },
+        {
+          key: 'creation',
+          // label: this.$t('open_creation') + 'Jan | Feb | März',
+          label:
+            this.$moment().subtract(2, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().subtract(1, 'month').format('MMM') +
+            ' | ' +
+            this.$moment().format('MMM'),
+          formatter: (value, key, item) => {
+            return String(value[0]) + ` | ` + String(value[1]) + ` |  ` + String(value[2])
+          },
+        },
         { key: 'bookmark', label: this.$t('remove') },
       ],
       itemsList: [],
@@ -77,6 +108,9 @@ export default {
       radioSelectedMass: '',
       criteria: '',
       creation: [null, null, null],
+      rows: 0,
+      currentPage: 1,
+      perPage: 25,
     }
   },
   async created() {
@@ -89,10 +123,13 @@ export default {
           query: searchUsers,
           variables: {
             searchText: this.criteria,
+            currentPage: this.currentPage,
+            pageSize: this.perPage,
           },
         })
         .then((result) => {
-          this.itemsList = result.data.searchUsers.map((user) => {
+          this.rows = result.data.searchUsers.userCount
+          this.itemsList = result.data.searchUsers.userList.map((user) => {
             return {
               ...user,
               showDetails: false,
@@ -109,16 +146,16 @@ export default {
 
       switch (event) {
         case 'push':
-          findArr = this.itemsList.find((arr) => arr.id === e.id)
+          findArr = this.itemsList.find((item) => e.userId === item.userId)
           index = this.itemsList.indexOf(findArr)
           this.itemsList.splice(index, 1)
-          this.itemsMassCreation.push(e)
+          this.itemsMassCreation.push(findArr)
           break
         case 'remove':
-          findArr = this.itemsMassCreation.find((arr) => arr.id === e.id)
+          findArr = this.itemsMassCreation.find((item) => e.userId === item.userId)
           index = this.itemsMassCreation.indexOf(findArr)
           this.itemsMassCreation.splice(index, 1)
-          this.itemsList.push(e)
+          this.itemsList.push(findArr)
           break
         default:
           throw new Error(event)
@@ -129,5 +166,13 @@ export default {
       this.itemsMassCreation = []
     },
   },
+  watch: {
+    currentPage() {
+      this.getUsers()
+    },
+    criteria() {
+      this.getUsers()
+    },
+  },
 }
 </script>
diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js
index 473b2bbdc..4beda0c49 100644
--- a/admin/src/pages/UserSearch.spec.js
+++ b/admin/src/pages/UserSearch.spec.js
@@ -5,15 +5,18 @@ const localVue = global.localVue
 
 const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
-    searchUsers: [
-      {
-        firstName: 'Bibi',
-        lastName: 'Bloxberg',
-        email: 'bibi@bloxberg.de',
-        creation: [200, 400, 600],
-        emailChecked: false,
-      },
-    ],
+    searchUsers: {
+      userCount: 1,
+      userList: [
+        {
+          firstName: 'Bibi',
+          lastName: 'Bloxberg',
+          email: 'bibi@bloxberg.de',
+          creation: [200, 400, 600],
+          emailChecked: false,
+        },
+      ],
+    },
   },
 })
 
@@ -61,7 +64,7 @@ describe('UserSearch', () => {
       })
 
       it('filters the users by unconfirmed emails', () => {
-        expect(wrapper.vm.searchResult).toHaveLength(0)
+        expect(wrapper.vm.searchResult).toHaveLength(1)
       })
     })
 
diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue
index 2c8b289e0..4b9bcae8a 100644
--- a/admin/src/pages/UserSearch.vue
+++ b/admin/src/pages/UserSearch.vue
@@ -3,7 +3,7 @@
     <div style="text-align: right">
       <b-button block variant="danger" @click="unconfirmedRegisterMails">
         <b-icon icon="envelope" variant="light"></b-icon>
-        {{ $t('unregistered_emails') }}
+        {{ filterCheckedEmails ? $t('all_emails') : $t('unregistered_emails') }}
       </b-button>
     </div>
     <label>{{ $t('user_search') }}</label>
@@ -21,6 +21,14 @@
       :fieldsTable="fields"
       :criteria="criteria"
     />
+    <b-pagination
+      pills
+      size="lg"
+      v-model="currentPage"
+      per-page="perPage"
+      :total-rows="rows"
+      align="center"
+    ></b-pagination>
     <div></div>
   </div>
 </template>
@@ -42,27 +50,13 @@ export default {
         { key: 'lastName', label: this.$t('lastname') },
         {
           key: 'creation',
-          label: this.$t('open_creation'),
+          label: [
+            this.$moment().subtract(2, 'month').format('MMM'),
+            this.$moment().subtract(1, 'month').format('MMM'),
+            this.$moment().format('MMM'),
+          ].join(' | '),
           formatter: (value, key, item) => {
-            return (
-              `
-            <div>` +
-              this.$moment().subtract(2, 'month').format('MMMM') +
-              ` - ` +
-              String(value[0]) +
-              ` GDD</div>
-            <div>` +
-              this.$moment().subtract(1, 'month').format('MMMM') +
-              ` - ` +
-              String(value[1]) +
-              ` GDD</div>
-            <div>` +
-              this.$moment().format('MMMM') +
-              ` - ` +
-              String(value[2]) +
-              ` GDD</div>
-            `
-            )
+            return value.join(' | ')
           },
         },
         { key: 'show_details', label: this.$t('details') },
@@ -81,14 +75,16 @@ export default {
       beforeLastMonth: {
         short: this.$moment().subtract(2, 'month').format('MMMM'),
       },
+      filterCheckedEmails: false,
+      rows: 0,
+      currentPage: 1,
+      perPage: 25,
     }
   },
-
   methods: {
     unconfirmedRegisterMails() {
-      this.searchResult = this.searchResult.filter((user) => {
-        return user.emailChecked
-      })
+      this.filterCheckedEmails = !this.filterCheckedEmails
+      this.getUsers()
     },
     getUsers() {
       this.$apollo
@@ -96,16 +92,25 @@ export default {
           query: searchUsers,
           variables: {
             searchText: this.criteria,
+            currentPage: this.currentPage,
+            pageSize: this.perPage,
+            notActivated: this.filterCheckedEmails,
           },
         })
         .then((result) => {
-          this.searchResult = result.data.searchUsers
+          this.rows = result.data.searchUsers.userCount
+          this.searchResult = result.data.searchUsers.userList
         })
         .catch((error) => {
           this.$toasted.error(error.message)
         })
     },
   },
+  watch: {
+    currentPage() {
+      this.getUsers()
+    },
+  },
   created() {
     this.getUsers()
   },
diff --git a/admin/src/plugins/apolloProvider.js b/admin/src/plugins/apolloProvider.js
index 0e342b8fc..cde5408da 100644
--- a/admin/src/plugins/apolloProvider.js
+++ b/admin/src/plugins/apolloProvider.js
@@ -2,7 +2,6 @@ import { ApolloClient, ApolloLink, InMemoryCache, HttpLink } from 'apollo-boost'
 import VueApollo from 'vue-apollo'
 import CONFIG from '../config'
 import store from '../store/store'
-import router from '../router/router'
 import i18n from '../i18n'
 
 const httpLink = new HttpLink({ uri: CONFIG.GRAPHQL_URI })
@@ -18,7 +17,7 @@ const authLink = new ApolloLink((operation, forward) => {
     if (response.errors && response.errors[0].message === '403.13 - Client certificate revoked') {
       response.errors[0].message = i18n.t('error.session-expired')
       store.dispatch('logout', null)
-      if (router.currentRoute.path !== '/logout') router.push('/logout')
+      window.location.assign(CONFIG.WALLET_URL)
       return response
     }
     const newToken = operation.getContext().response.headers.get('token')
diff --git a/admin/src/plugins/apolloProvider.test.js b/admin/src/plugins/apolloProvider.test.js
index e5f394e96..75e415901 100644
--- a/admin/src/plugins/apolloProvider.test.js
+++ b/admin/src/plugins/apolloProvider.test.js
@@ -4,12 +4,10 @@ import CONFIG from '../config'
 
 import VueApollo from 'vue-apollo'
 import store from '../store/store'
-import router from '../router/router'
 import i18n from '../i18n'
 
 jest.mock('vue-apollo')
 jest.mock('../store/store')
-jest.mock('../router/router')
 jest.mock('../i18n')
 
 jest.mock('apollo-boost', () => {
@@ -59,13 +57,11 @@ describe('apolloProvider', () => {
       errors: [{ message: '403.13 - Client certificate revoked' }],
     }
 
-    // mock router
-    const routerPushMock = jest.fn()
-    router.push = routerPushMock
-    router.currentRoute = {
-      path: '/overview',
+    const windowLocationMock = jest.fn()
+    delete window.location
+    window.location = {
+      assign: windowLocationMock,
     }
-
     // mock context
     const setContextMock = jest.fn()
     const getContextMock = jest.fn(() => {
@@ -128,21 +124,8 @@ describe('apolloProvider', () => {
         expect(storeDispatchMock).toBeCalledWith('logout', null)
       })
 
-      describe('current route is not logout', () => {
-        it('redirects to logout', () => {
-          expect(routerPushMock).toBeCalledWith('/logout')
-        })
-      })
-
-      describe('current route is logout', () => {
-        beforeEach(() => {
-          jest.clearAllMocks()
-          router.currentRoute.path = '/logout'
-        })
-
-        it('does not redirect to logout', () => {
-          expect(routerPushMock).not.toBeCalled()
-        })
+      it('redirects to logout', () => {
+        expect(windowLocationMock).toBeCalledWith('http://localhost/login')
       })
     })
 
diff --git a/admin/src/router/guards.js b/admin/src/router/guards.js
index 4ed6c8516..dd61e8657 100644
--- a/admin/src/router/guards.js
+++ b/admin/src/router/guards.js
@@ -1,7 +1,7 @@
 import { verifyLogin } from '../graphql/verifyLogin'
 import CONFIG from '../config'
 
-const addNavigationGuards = (router, store, apollo) => {
+const addNavigationGuards = (router, store, apollo, i18n) => {
   // store token on `authenticate`
   router.beforeEach(async (to, from, next) => {
     if (to.path === '/authenticate' && to.query && to.query.token) {
@@ -14,6 +14,7 @@ const addNavigationGuards = (router, store, apollo) => {
         .then((result) => {
           const moderator = result.data.verifyLogin
           if (moderator.isAdmin) {
+            i18n.locale = moderator.language
             store.commit('moderator', moderator)
             next({ path: '/' })
           } else {
diff --git a/admin/src/router/guards.test.js b/admin/src/router/guards.test.js
index cd5b33e68..da4dd5969 100644
--- a/admin/src/router/guards.test.js
+++ b/admin/src/router/guards.test.js
@@ -6,9 +6,11 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
   data: {
     verifyLogin: {
       isAdmin: true,
+      language: 'de',
     },
   },
 })
+const i18nLocaleMock = jest.fn()
 
 const store = {
   commit: storeCommitMock,
@@ -21,7 +23,11 @@ const apollo = {
   query: apolloQueryMock,
 }
 
-addNavigationGuards(router, store, apollo)
+const i18n = {
+  locale: i18nLocaleMock,
+}
+
+addNavigationGuards(router, store, apollo, i18n)
 
 describe('navigation guards', () => {
   beforeEach(() => {
@@ -33,19 +39,23 @@ describe('navigation guards', () => {
     const next = jest.fn()
 
     describe('with valid token and as admin', () => {
-      beforeEach(() => {
-        navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
+      beforeEach(async () => {
+        await navGuard({ path: '/authenticate', query: { token: 'valid-token' } }, {}, next)
       })
 
-      it('commits the token to the store', async () => {
+      it('commits the token to the store', () => {
         expect(storeCommitMock).toBeCalledWith('token', 'valid-token')
       })
 
-      it('commits the moderator to the store', () => {
-        expect(storeCommitMock).toBeCalledWith('moderator', { isAdmin: true })
+      it.skip('sets the locale', () => {
+        expect(i18nLocaleMock).toBeCalledWith('de')
       })
 
-      it('redirects to /', async () => {
+      it('commits the moderator to the store', () => {
+        expect(storeCommitMock).toBeCalledWith('moderator', { isAdmin: true, language: 'de' })
+      })
+
+      it('redirects to /', () => {
         expect(next).toBeCalledWith({ path: '/' })
       })
     })
diff --git a/backend/.env.dist b/backend/.env.dist
index f38e31be5..785b2c15d 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -8,6 +8,7 @@ DB_PORT=3306
 DB_USER=root
 DB_PASSWORD=
 DB_DATABASE=gradido_community
+TYPEORM_LOGGING_RELATIVE_PATH=typeorm.backend.log
 
 #EMAIL=true
 #EMAIL_USERNAME=
@@ -19,7 +20,8 @@ DB_DATABASE=gradido_community
 #RESEND_TIME=
 RESEND_TIME=10
 
-#EMAIL_LINK_VERIFICATION=http://localhost/vue/checkEmail/$1
+#EMAIL_LINK_VERIFICATION=http://localhost/checkEmail/{code}
+#EMAIL_LINK_SETPASSWORD=http://localhost/reset/{code}
 
 #KLICKTIPP_USER=
 #KLICKTIPP_PASSWORD=
diff --git a/backend/.env.template b/backend/.env.template
new file mode 100644
index 000000000..9ff9beb01
--- /dev/null
+++ b/backend/.env.template
@@ -0,0 +1,35 @@
+PORT=4000
+JWT_SECRET=$JWT_SECRET
+JWT_EXPIRES_IN=10m
+GRAPHIQL=false
+GDT_API_URL=https://gdt.gradido.net
+DB_HOST=localhost
+DB_PORT=3306
+DB_USER=$DB_USER
+DB_PASSWORD=$DB_PASSWORD
+DB_DATABASE=gradido_community
+TYPEORM_LOGGING_RELATIVE_PATH=$TYPEORM_LOGGING_RELATIVE_PATH
+
+EMAIL=$EMAIL
+EMAIL_USERNAME=$EMAIL_USERNAME
+EMAIL_SENDER=$EMAIL_SENDER
+EMAIL_PASSWORD=$EMAIL_PASSWORD
+EMAIL_SMTP_URL=$EMAIL_SMTP_URL
+EMAIL_SMTP_PORT=587
+#RESEND_TIME=1 minute, 60 => 1hour, 1440 (60 minutes * 24 hours) => 24 hours 
+RESEND_TIME=10
+
+EMAIL_LINK_VERIFICATION=$EMAIL_LINK_VERIFICATION
+EMAIL_LINK_SETPASSWORD=$EMAIL_LINK_SETPASSWORD
+
+#KLICKTIPP_USER=
+#KLICKTIPP_PASSWORD=
+#KLICKTIPP_APIKEY_DE=
+#KLICKTIPP_APIKEY_EN=
+#KLICKTIPP=true
+COMMUNITY_NAME=
+COMMUNITY_URL=
+COMMUNITY_REGISTER_URL=
+COMMUNITY_DESCRIPTION=
+
+WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET
\ No newline at end of file
diff --git a/backend/jest.config.js b/backend/jest.config.js
index 9d99c68f6..981475807 100644
--- a/backend/jest.config.js
+++ b/backend/jest.config.js
@@ -1,15 +1,18 @@
 /** @type {import('ts-jest/dist/types').InitialOptionsTsJest} */
-module.exports = {
-  verbose: true,
-  preset: 'ts-jest',
-  collectCoverage: true,
-  collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**'],
-  moduleNameMapper: {
-    '@entity/(.*)': '<rootDir>/../database/build/entity/$1',
-    // This is hack to fix a problem with the library `ts-mysql-migrate` which does differentiate between its ts/js state
-    '@dbTools/(.*)':
-      process.env.NODE_ENV === 'development'
-        ? '<rootDir>/../database/src/$1'
-        : '<rootDir>/../database/build/src/$1',
-  },
+module.exports = async () => {
+  process.env.TZ = 'UTC'
+  return {
+    verbose: true,
+    preset: 'ts-jest',
+    collectCoverage: true,
+    collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**'],
+    moduleNameMapper: {
+      '@entity/(.*)': '<rootDir>/../database/build/entity/$1',
+      // This is hack to fix a problem with the library `ts-mysql-migrate` which does differentiate between its ts/js state
+      '@dbTools/(.*)':
+        process.env.NODE_ENV === 'development'
+          ? '<rootDir>/../database/src/$1'
+          : '<rootDir>/../database/build/src/$1',
+    },
+  }
 }
diff --git a/backend/package.json b/backend/package.json
index c9314f0fd..b61938044 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -18,10 +18,10 @@
   },
   "dependencies": {
     "@types/jest": "^27.0.2",
+    "apollo-log": "^1.1.0",
     "apollo-server-express": "^2.25.2",
     "apollo-server-testing": "^2.25.2",
     "axios": "^0.21.1",
-    "body-parser": "^1.19.0",
     "class-validator": "^0.13.1",
     "cors": "^2.8.5",
     "dotenv": "^10.0.0",
diff --git a/backend/src/apis/KlicktippController.ts b/backend/src/apis/KlicktippController.ts
index 544b39d97..0777211ad 100644
--- a/backend/src/apis/KlicktippController.ts
+++ b/backend/src/apis/KlicktippController.ts
@@ -5,7 +5,7 @@ import CONFIG from '../config'
 
 const klicktippConnector = new KlicktippConnector()
 
-export const signIn = async (
+export const klicktippSignIn = async (
   email: string,
   language: string,
   firstName?: string,
diff --git a/backend/src/auth/RIGHTS.ts b/backend/src/auth/RIGHTS.ts
index 6a2c05025..8988620d7 100644
--- a/backend/src/auth/RIGHTS.ts
+++ b/backend/src/auth/RIGHTS.ts
@@ -21,4 +21,9 @@ export enum RIGHTS {
   HAS_ELOPAGE = 'HAS_ELOPAGE',
   // Admin
   SEARCH_USERS = 'SEARCH_USERS',
+  CREATE_PENDING_CREATION = 'CREATE_PENDING_CREATION',
+  UPDATE_PENDING_CREATION = 'UPDATE_PENDING_CREATION',
+  SEARCH_PENDING_CREATION = 'SEARCH_PENDING_CREATION',
+  DELETE_PENDING_CREATION = 'DELETE_PENDING_CREATION',
+  CONFIRM_PENDING_CREATION = 'CONFIRM_PENDING_CREATION',
 }
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 88d07737c..7ca55eba1 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -18,6 +18,7 @@ const database = {
   DB_USER: process.env.DB_USER || 'root',
   DB_PASSWORD: process.env.DB_PASSWORD || '',
   DB_DATABASE: process.env.DB_DATABASE || 'gradido_community',
+  TYPEORM_LOGGING_RELATIVE_PATH: process.env.TYPEORM_LOGGING_RELATIVE_PATH || 'typeorm.backend.log',
 }
 
 const klicktipp = {
@@ -31,8 +32,8 @@ const klicktipp = {
 
 const community = {
   COMMUNITY_NAME: process.env.COMMUNITY_NAME || 'Gradido Entwicklung',
-  COMMUNITY_URL: process.env.COMMUNITY_URL || 'http://localhost/vue/',
-  COMMUNITY_REGISTER_URL: process.env.COMMUNITY_REGISTER_URL || 'http://localhost/vue/register',
+  COMMUNITY_URL: process.env.COMMUNITY_URL || 'http://localhost/',
+  COMMUNITY_REGISTER_URL: process.env.COMMUNITY_REGISTER_URL || 'http://localhost/register',
   COMMUNITY_DESCRIPTION:
     process.env.COMMUNITY_DESCRIPTION || 'Die lokale Entwicklungsumgebung von Gradido.',
 }
@@ -51,12 +52,13 @@ const email = {
   EMAIL_SMTP_URL: process.env.EMAIL_SMTP_URL || 'gmail.com',
   EMAIL_SMTP_PORT: process.env.EMAIL_SMTP_PORT || '587',
   EMAIL_LINK_VERIFICATION:
-    process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/vue/checkEmail/$1',
-  EMAIL_LINK_SETPASSWORD: process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/vue/reset/$1',
+    process.env.EMAIL_LINK_VERIFICATION || 'http://localhost/checkEmail/{code}',
+  EMAIL_LINK_SETPASSWORD: process.env.EMAIL_LINK_SETPASSWORD || 'http://localhost/reset/{code}',
   RESEND_TIME: isNaN(resendTime) ? 10 : resendTime,
 }
 
 const webhook = {
+  // Elopage
   WEBHOOK_ELOPAGE_SECRET: process.env.WEBHOOK_ELOPAGE_SECRET || 'secret',
 }
 
diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts
index dfd4a4e85..b90ad3231 100644
--- a/backend/src/graphql/arg/CreatePendingCreationArgs.ts
+++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts
@@ -1,5 +1,6 @@
-import { ArgsType, Field, Float, Int } from 'type-graphql'
+import { ArgsType, Field, Float, InputType, Int } from 'type-graphql'
 
+@InputType()
 @ArgsType()
 export default class CreatePendingCreationArgs {
   @Field(() => String)
diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts
new file mode 100644
index 000000000..5b40fd9ca
--- /dev/null
+++ b/backend/src/graphql/arg/SearchUsersArgs.ts
@@ -0,0 +1,16 @@
+import { ArgsType, Field, Int } from 'type-graphql'
+
+@ArgsType()
+export default class SearchUsersArgs {
+  @Field(() => String)
+  searchText: string
+
+  @Field(() => Int, { nullable: true })
+  currentPage?: number
+
+  @Field(() => Int, { nullable: true })
+  pageSize?: number
+
+  @Field(() => Boolean, { nullable: true })
+  notActivated?: boolean
+}
diff --git a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts b/backend/src/graphql/arg/UpdatePendingCreationArgs.ts
index 8cd9ccc4c..73f70c058 100644
--- a/backend/src/graphql/arg/UpdatePendingCreationArgs.ts
+++ b/backend/src/graphql/arg/UpdatePendingCreationArgs.ts
@@ -1,7 +1,7 @@
 import { ArgsType, Field, Float, Int } from 'type-graphql'
 
 @ArgsType()
-export default class CreatePendingCreationArgs {
+export default class UpdatePendingCreationArgs {
   @Field(() => Int)
   id: number
 
diff --git a/backend/src/graphql/model/CreatePendingCreations.ts b/backend/src/graphql/model/CreatePendingCreations.ts
new file mode 100644
index 000000000..8d5bcef2c
--- /dev/null
+++ b/backend/src/graphql/model/CreatePendingCreations.ts
@@ -0,0 +1,19 @@
+import { ObjectType, Field } from 'type-graphql'
+
+@ObjectType()
+export class CreatePendingCreations {
+  constructor() {
+    this.success = false
+    this.successfulCreation = []
+    this.failedCreation = []
+  }
+
+  @Field(() => Boolean)
+  success: boolean
+
+  @Field(() => [String])
+  successfulCreation: string[]
+
+  @Field(() => [String])
+  failedCreation: string[]
+}
diff --git a/backend/src/graphql/model/UserAdmin.ts b/backend/src/graphql/model/UserAdmin.ts
index befc203a5..9e28a33d6 100644
--- a/backend/src/graphql/model/UserAdmin.ts
+++ b/backend/src/graphql/model/UserAdmin.ts
@@ -1,4 +1,4 @@
-import { ObjectType, Field } from 'type-graphql'
+import { ObjectType, Field, Int } from 'type-graphql'
 
 @ObjectType()
 export class UserAdmin {
@@ -20,3 +20,12 @@ export class UserAdmin {
   @Field(() => Boolean)
   emailChecked: boolean
 }
+
+@ObjectType()
+export class SearchUsersResult {
+  @Field(() => Int)
+  userCount: number
+
+  @Field(() => [UserAdmin])
+  userList: UserAdmin[]
+}
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index cb23ed577..8a7e034a5 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -1,7 +1,11 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+
 import { Resolver, Query, Arg, Args, Authorized, Mutation, Ctx } from 'type-graphql'
 import { getCustomRepository, Raw } from 'typeorm'
-import { UserAdmin } from '../model/UserAdmin'
+import { UserAdmin, SearchUsersResult } from '../model/UserAdmin'
 import { PendingCreation } from '../model/PendingCreation'
+import { CreatePendingCreations } from '../model/CreatePendingCreations'
 import { UpdatePendingCreation } from '../model/UpdatePendingCreation'
 import { RIGHTS } from '../../auth/RIGHTS'
 import { TransactionRepository } from '../../typeorm/repository/Transaction'
@@ -10,6 +14,7 @@ import { LoginPendingTasksAdminRepository } from '../../typeorm/repository/Login
 import { UserRepository } from '../../typeorm/repository/User'
 import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs'
 import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs'
+import SearchUsersArgs from '../arg/SearchUsersArgs'
 import moment from 'moment'
 import { Transaction } from '@entity/Transaction'
 import { TransactionCreation } from '@entity/TransactionCreation'
@@ -22,11 +27,13 @@ import { LoginUserRepository } from '../../typeorm/repository/LoginUser'
 @Resolver()
 export class AdminResolver {
   @Authorized([RIGHTS.SEARCH_USERS])
-  @Query(() => [UserAdmin])
-  async searchUsers(@Arg('searchText') searchText: string): Promise<UserAdmin[]> {
+  @Query(() => SearchUsersResult)
+  async searchUsers(
+    @Args() { searchText, currentPage = 1, pageSize = 25, notActivated = false }: SearchUsersArgs,
+  ): Promise<SearchUsersResult> {
     const userRepository = getCustomRepository(UserRepository)
     const users = await userRepository.findBySearchCriteria(searchText)
-    const adminUsers = await Promise.all(
+    let adminUsers = await Promise.all(
       users.map(async (user) => {
         const adminUser = new UserAdmin()
         adminUser.userId = user.id
@@ -38,10 +45,15 @@ export class AdminResolver {
         return adminUser
       }),
     )
-    return adminUsers
+    if (notActivated) adminUsers = adminUsers.filter((u) => !u.emailChecked)
+    const first = (currentPage - 1) * pageSize
+    return {
+      userCount: adminUsers.length,
+      userList: adminUsers.slice(first, first + pageSize),
+    }
   }
 
-  @Authorized([RIGHTS.SEARCH_USERS])
+  @Authorized([RIGHTS.CREATE_PENDING_CREATION])
   @Mutation(() => [Number])
   async createPendingCreation(
     @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs,
@@ -61,12 +73,38 @@ export class AdminResolver {
       loginPendingTaskAdmin.memo = memo
       loginPendingTaskAdmin.moderator = moderator
 
-      loginPendingTasksAdminRepository.save(loginPendingTaskAdmin)
+      await loginPendingTasksAdminRepository.save(loginPendingTaskAdmin)
     }
-    return await getUserCreations(user.id)
+    return getUserCreations(user.id)
   }
 
-  @Authorized([RIGHTS.SEARCH_USERS])
+  @Authorized([RIGHTS.CREATE_PENDING_CREATION])
+  @Mutation(() => CreatePendingCreations)
+  async createPendingCreations(
+    @Arg('pendingCreations', () => [CreatePendingCreationArgs])
+    pendingCreations: CreatePendingCreationArgs[],
+  ): Promise<CreatePendingCreations> {
+    let success = false
+    const successfulCreation: string[] = []
+    const failedCreation: string[] = []
+    for (const pendingCreation of pendingCreations) {
+      await this.createPendingCreation(pendingCreation)
+        .then(() => {
+          successfulCreation.push(pendingCreation.email)
+          success = true
+        })
+        .catch(() => {
+          failedCreation.push(pendingCreation.email)
+        })
+    }
+    return {
+      success,
+      successfulCreation,
+      failedCreation,
+    }
+  }
+
+  @Authorized([RIGHTS.UPDATE_PENDING_CREATION])
   @Mutation(() => UpdatePendingCreation)
   async updatePendingCreation(
     @Args() { id, email, amount, memo, creationDate, moderator }: UpdatePendingCreationArgs,
@@ -96,7 +134,7 @@ export class AdminResolver {
     return result
   }
 
-  @Authorized([RIGHTS.SEARCH_USERS])
+  @Authorized([RIGHTS.SEARCH_PENDING_CREATION])
   @Query(() => [PendingCreation])
   async getPendingCreations(): Promise<PendingCreation[]> {
     const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository)
@@ -124,7 +162,7 @@ export class AdminResolver {
     return pendingCreationsPromise.reverse()
   }
 
-  @Authorized([RIGHTS.SEARCH_USERS])
+  @Authorized([RIGHTS.DELETE_PENDING_CREATION])
   @Mutation(() => Boolean)
   async deletePendingCreation(@Arg('id') id: number): Promise<boolean> {
     const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository)
@@ -133,7 +171,7 @@ export class AdminResolver {
     return !!res
   }
 
-  @Authorized([RIGHTS.SEARCH_USERS])
+  @Authorized([RIGHTS.CONFIRM_PENDING_CREATION])
   @Mutation(() => Boolean)
   async confirmPendingCreation(@Arg('id') id: number, @Ctx() context: any): Promise<boolean> {
     const loginPendingTasksAdminRepository = getCustomRepository(LoginPendingTasksAdminRepository)
@@ -310,6 +348,7 @@ function isCreationValid(creations: number[], amount: number, creationDate: Date
   }
   return true
 }
+
 async function hasActivatedEmail(email: string): Promise<boolean> {
   const repository = getCustomRepository(LoginUserRepository)
   const user = await repository.findByEmail(email)
diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts
index afc6decec..cc481c101 100644
--- a/backend/src/graphql/resolver/CommunityResolver.test.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.test.ts
@@ -53,8 +53,8 @@ describe('CommunityResolver', () => {
           getCommunityInfo: {
             name: 'Gradido Entwicklung',
             description: 'Die lokale Entwicklungsumgebung von Gradido.',
-            url: 'http://localhost/vue/',
-            registerUrl: 'http://localhost/vue/register',
+            url: 'http://localhost/',
+            registerUrl: 'http://localhost/register',
           },
         },
       })
@@ -75,22 +75,22 @@ describe('CommunityResolver', () => {
                 id: 1,
                 name: 'Gradido Entwicklung',
                 description: 'Die lokale Entwicklungsumgebung von Gradido.',
-                url: 'http://localhost/vue/',
-                registerUrl: 'http://localhost/vue/register-community',
+                url: 'http://localhost/',
+                registerUrl: 'http://localhost/register-community',
               },
               {
                 id: 2,
                 name: 'Gradido Staging',
                 description: 'Der Testserver der Gradido-Akademie.',
-                url: 'https://stage1.gradido.net/vue/',
-                registerUrl: 'https://stage1.gradido.net/vue/register-community',
+                url: 'https://stage1.gradido.net/',
+                registerUrl: 'https://stage1.gradido.net/register-community',
               },
               {
                 id: 3,
                 name: 'Gradido-Akademie',
                 description: 'Freies Institut für Wirtschaftsbionik.',
                 url: 'https://gradido.net',
-                registerUrl: 'https://gdd1.gradido.com/vue/register-community',
+                registerUrl: 'https://gdd1.gradido.com/register-community',
               },
             ],
           },
@@ -112,7 +112,7 @@ describe('CommunityResolver', () => {
                 name: 'Gradido-Akademie',
                 description: 'Freies Institut für Wirtschaftsbionik.',
                 url: 'https://gradido.net',
-                registerUrl: 'https://gdd1.gradido.com/vue/register-community',
+                registerUrl: 'https://gdd1.gradido.com/register-community',
               },
             ],
           },
diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts
index 5c9d46f34..1fa3887dc 100644
--- a/backend/src/graphql/resolver/CommunityResolver.ts
+++ b/backend/src/graphql/resolver/CommunityResolver.ts
@@ -29,7 +29,7 @@ export class CommunityResolver {
           name: 'Gradido-Akademie',
           description: 'Freies Institut für Wirtschaftsbionik.',
           url: 'https://gradido.net',
-          registerUrl: 'https://gdd1.gradido.com/vue/register-community',
+          registerUrl: 'https://gdd1.gradido.com/register-community',
         }),
       ]
     return [
@@ -37,22 +37,22 @@ export class CommunityResolver {
         id: 1,
         name: 'Gradido Entwicklung',
         description: 'Die lokale Entwicklungsumgebung von Gradido.',
-        url: 'http://localhost/vue/',
-        registerUrl: 'http://localhost/vue/register-community',
+        url: 'http://localhost/',
+        registerUrl: 'http://localhost/register-community',
       }),
       new Community({
         id: 2,
         name: 'Gradido Staging',
         description: 'Der Testserver der Gradido-Akademie.',
-        url: 'https://stage1.gradido.net/vue/',
-        registerUrl: 'https://stage1.gradido.net/vue/register-community',
+        url: 'https://stage1.gradido.net/',
+        registerUrl: 'https://stage1.gradido.net/register-community',
       }),
       new Community({
         id: 3,
         name: 'Gradido-Akademie',
         description: 'Freies Institut für Wirtschaftsbionik.',
         url: 'https://gradido.net',
-        registerUrl: 'https://gdd1.gradido.com/vue/register-community',
+        registerUrl: 'https://gdd1.gradido.com/register-community',
       }),
     ]
   }
diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts
index fdffb940a..0ba2387e3 100644
--- a/backend/src/graphql/resolver/KlicktippResolver.ts
+++ b/backend/src/graphql/resolver/KlicktippResolver.ts
@@ -6,7 +6,7 @@ import {
   getKlickTippUser,
   getKlicktippTagMap,
   unsubscribe,
-  signIn,
+  klicktippSignIn,
 } from '../../apis/KlicktippController'
 import { RIGHTS } from '../../auth/RIGHTS'
 import SubscribeNewsletterArgs from '../arg/SubscribeNewsletterArgs'
@@ -36,6 +36,6 @@ export class KlicktippResolver {
   async subscribeNewsletter(
     @Args() { email, language }: SubscribeNewsletterArgs,
   ): Promise<boolean> {
-    return await signIn(email, language)
+    return await klicktippSignIn(email, language)
   }
 }
diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index d8ef1fb0f..871e1b9d6 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -6,7 +6,7 @@ import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql'
 import { getCustomRepository, getConnection, QueryRunner } from 'typeorm'
 
 import CONFIG from '../../config'
-import { sendEMail } from '../../util/sendEMail'
+import { sendTransactionReceivedEmail } from '../../mailer/sendTransactionReceivedEmail'
 
 import { Transaction } from '../model/Transaction'
 import { TransactionList } from '../model/TransactionList'
@@ -503,7 +503,7 @@ export class TransactionResolver {
       email: userEntity.email,
     })
     if (!resultGDTSum.success) throw new Error(resultGDTSum.data)
-    transactions.gdtSum = resultGDTSum.data.sum || 0
+    transactions.gdtSum = Number(resultGDTSum.data.sum / 100) || 0
 
     // get balance
     const balanceRepository = getCustomRepository(BalanceRepository)
@@ -651,21 +651,14 @@ export class TransactionResolver {
     }
     // send notification email
     // TODO: translate
-    await sendEMail({
-      from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`,
-      to: `${recipiantUser.firstName} ${recipiantUser.lastName} <${recipiantUser.email}>`,
-      subject: 'Gradido Überweisung',
-      text: `Hallo ${recipiantUser.firstName} ${recipiantUser.lastName}
-      
-      Du hast soeben ${amount} GDD von ${senderUser.firstName} ${senderUser.lastName} erhalten.
-      ${senderUser.firstName} ${senderUser.lastName} schreibt:
-      
-      ${memo}
-      
-      Bitte antworte nicht auf diese E-Mail!
-      
-      Mit freundlichen Grüßen,
-      dein Gradido-Team`,
+    await sendTransactionReceivedEmail({
+      senderFirstName: senderUser.firstName,
+      senderLastName: senderUser.lastName,
+      recipientFirstName: recipiantUser.firstName,
+      recipientLastName: recipiantUser.lastName,
+      email: recipiantUser.email,
+      amount,
+      memo,
     })
 
     return 'success'
diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts
index d0c144e22..02e490edd 100644
--- a/backend/src/graphql/resolver/UserResolver.test.ts
+++ b/backend/src/graphql/resolver/UserResolver.test.ts
@@ -12,12 +12,20 @@ import { LoginUserBackup } from '@entity/LoginUserBackup'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
 import { User } from '@entity/User'
 import CONFIG from '../../config'
-import { sendEMail } from '../../util/sendEMail'
+import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail'
+import { klicktippSignIn } from '../../apis/KlicktippController'
 
-jest.mock('../../util/sendEMail', () => {
+jest.mock('../../mailer/sendAccountActivationEmail', () => {
   return {
     __esModule: true,
-    sendEMail: jest.fn(),
+    sendAccountActivationEmail: jest.fn(),
+  }
+})
+
+jest.mock('../../apis/KlicktippController', () => {
+  return {
+    __esModule: true,
+    klicktippSignIn: jest.fn(),
   }
 })
 
@@ -62,7 +70,6 @@ describe('UserResolver', () => {
 
     let result: any
     let emailOptIn: string
-    let newUser: User
 
     beforeAll(async () => {
       result = await mutate({ mutation, variables })
@@ -90,7 +97,6 @@ describe('UserResolver', () => {
         loginEmailOptIn = await getRepository(LoginEmailOptIn)
           .createQueryBuilder('login_email_optin')
           .getMany()
-        newUser = user[0]
         emailOptIn = loginEmailOptIn[0].verificationCode.toString()
       })
 
@@ -164,14 +170,12 @@ describe('UserResolver', () => {
 
     describe('account activation email', () => {
       it('sends an account activation email', () => {
-        const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(/\$1/g, emailOptIn)
-        expect(sendEMail).toBeCalledWith({
-          from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`,
-          to: `${newUser.firstName} ${newUser.lastName} <${newUser.email}>`,
-          subject: 'Gradido: E-Mail Überprüfung',
-          text:
-            expect.stringContaining(`Hallo ${newUser.firstName} ${newUser.lastName},`) &&
-            expect.stringContaining(activationLink),
+        const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(/{code}/g, emailOptIn)
+        expect(sendAccountActivationEmail).toBeCalledWith({
+          link: activationLink,
+          firstName: 'Peter',
+          lastName: 'Lustig',
+          email: 'peter@lustig.de',
         })
       })
     })
@@ -224,6 +228,157 @@ describe('UserResolver', () => {
       })
     })
   })
+
+  describe('setPassword', () => {
+    const createUserMutation = gql`
+      mutation (
+        $email: String!
+        $firstName: String!
+        $lastName: String!
+        $language: String!
+        $publisherId: Int
+      ) {
+        createUser(
+          email: $email
+          firstName: $firstName
+          lastName: $lastName
+          language: $language
+          publisherId: $publisherId
+        )
+      }
+    `
+
+    const createUserVariables = {
+      email: 'peter@lustig.de',
+      firstName: 'Peter',
+      lastName: 'Lustig',
+      language: 'de',
+      publisherId: 1234,
+    }
+
+    const setPasswordMutation = gql`
+      mutation ($code: String!, $password: String!) {
+        setPassword(code: $code, password: $password)
+      }
+    `
+    let result: any
+    let emailOptIn: string
+
+    describe('valid optin code and valid password', () => {
+      let loginUser: any
+      let newLoginUser: any
+      let newUser: any
+
+      beforeAll(async () => {
+        await mutate({ mutation: createUserMutation, variables: createUserVariables })
+        const loginEmailOptIn = await getRepository(LoginEmailOptIn)
+          .createQueryBuilder('login_email_optin')
+          .getMany()
+        loginUser = await getRepository(LoginUser).createQueryBuilder('login_user').getMany()
+        emailOptIn = loginEmailOptIn[0].verificationCode.toString()
+        result = await mutate({
+          mutation: setPasswordMutation,
+          variables: { code: emailOptIn, password: 'Aa12345_' },
+        })
+        newLoginUser = await getRepository(LoginUser).createQueryBuilder('login_user').getMany()
+        newUser = await getRepository(User).createQueryBuilder('state_user').getMany()
+      })
+
+      afterAll(async () => {
+        await resetDB()
+      })
+
+      it('sets email checked to true', () => {
+        expect(newLoginUser[0].emailChecked).toBeTruthy()
+      })
+
+      it('updates the password', () => {
+        expect(newLoginUser[0].password).toEqual('3917921995996627700')
+      })
+
+      it('updates the public Key on both user tables', () => {
+        expect(newLoginUser[0].pubKey).toEqual(expect.any(Buffer))
+        expect(newLoginUser[0].pubKey).not.toEqual(loginUser[0].pubKey)
+        expect(newLoginUser[0].pubKey).toEqual(newUser[0].pubkey)
+      })
+
+      it('updates the private Key', () => {
+        expect(newLoginUser[0].privKey).toEqual(expect.any(Buffer))
+        expect(newLoginUser[0].privKey).not.toEqual(loginUser[0].privKey)
+      })
+
+      it('removes the optin', async () => {
+        await expect(
+          getRepository(LoginEmailOptIn).createQueryBuilder('login_email_optin').getMany(),
+        ).resolves.toHaveLength(0)
+      })
+
+      it('calls the klicktipp API', () => {
+        expect(klicktippSignIn).toBeCalledWith(
+          loginUser[0].email,
+          loginUser[0].language,
+          loginUser[0].firstName,
+          loginUser[0].lastName,
+        )
+      })
+
+      it('returns true', () => {
+        expect(result).toBeTruthy()
+      })
+    })
+
+    describe('no valid password', () => {
+      beforeAll(async () => {
+        await mutate({ mutation: createUserMutation, variables: createUserVariables })
+        const loginEmailOptIn = await getRepository(LoginEmailOptIn)
+          .createQueryBuilder('login_email_optin')
+          .getMany()
+        emailOptIn = loginEmailOptIn[0].verificationCode.toString()
+        result = await mutate({
+          mutation: setPasswordMutation,
+          variables: { code: emailOptIn, password: 'not-valid' },
+        })
+      })
+
+      afterAll(async () => {
+        await resetDB()
+      })
+
+      it('throws an error', () => {
+        expect(result).toEqual(
+          expect.objectContaining({
+            errors: [
+              new GraphQLError(
+                'Please enter a valid password with at least 8 characters, upper and lower case letters, at least one number and one special character!',
+              ),
+            ],
+          }),
+        )
+      })
+    })
+
+    describe('no valid optin code', () => {
+      beforeAll(async () => {
+        await mutate({ mutation: createUserMutation, variables: createUserVariables })
+        result = await mutate({
+          mutation: setPasswordMutation,
+          variables: { code: 'not valid', password: 'Aa12345_' },
+        })
+      })
+
+      afterAll(async () => {
+        await resetDB()
+      })
+
+      it('throws an error', () => {
+        expect(result).toEqual(
+          expect.objectContaining({
+            errors: [new GraphQLError('Could not login with emailVerificationCode')],
+          }),
+        )
+      })
+    })
+  })
 })
 
 afterAll(async () => {
diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 2f98a2f6f..bf4ef2a68 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -20,9 +20,10 @@ import { UserRepository } from '../../typeorm/repository/User'
 import { LoginUser } from '@entity/LoginUser'
 import { LoginUserBackup } from '@entity/LoginUserBackup'
 import { LoginEmailOptIn } from '@entity/LoginEmailOptIn'
-import { sendEMail } from '../../util/sendEMail'
+import { sendResetPasswordEmail } from '../../mailer/sendResetPasswordEmail'
+import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail'
 import { LoginElopageBuysRepository } from '../../typeorm/repository/LoginElopageBuys'
-import { signIn } from '../../apis/KlicktippController'
+import { klicktippSignIn } from '../../apis/KlicktippController'
 import { RIGHTS } from '../../auth/RIGHTS'
 import { ServerUserRepository } from '../../typeorm/repository/ServerUser'
 import { ROLE_ADMIN } from '../../auth/ROLES'
@@ -447,15 +448,15 @@ export class UserResolver {
       const emailOptIn = await createEmailOptIn(loginUserId, queryRunner)
 
       const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
-        /\$1/g,
+        /{code}/g,
         emailOptIn.verificationCode.toString(),
       )
-      const emailSent = await this.sendAccountActivationEmail(
-        activationLink,
+      const emailSent = await sendAccountActivationEmail({
+        link: activationLink,
         firstName,
         lastName,
         email,
-      )
+      })
 
       // In case EMails are disabled log the activation link for the user
       if (!emailSent) {
@@ -472,29 +473,6 @@ export class UserResolver {
     return 'success'
   }
 
-  private sendAccountActivationEmail(
-    activationLink: string,
-    firstName: string,
-    lastName: string,
-    email: string,
-  ): Promise<boolean> {
-    return sendEMail({
-      from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`,
-      to: `${firstName} ${lastName} <${email}>`,
-      subject: 'Gradido: E-Mail Überprüfung',
-      text: `Hallo ${firstName} ${lastName},
-        
-        Deine EMail wurde soeben bei Gradido registriert.
-        
-        Klicke bitte auf diesen Link, um die Registrierung abzuschließen und dein Gradido-Konto zu aktivieren:
-        ${activationLink}
-        oder kopiere den obigen Link in dein Browserfenster.
-        
-        Mit freundlichen Grüßen,
-        dein Gradido-Team`,
-    })
-  }
-
   @Mutation(() => Boolean)
   async sendActivationEmail(@Arg('email') email: string): Promise<boolean> {
     const loginUserRepository = getCustomRepository(LoginUserRepository)
@@ -508,16 +486,16 @@ export class UserResolver {
       const emailOptIn = await createEmailOptIn(loginUser.id, queryRunner)
 
       const activationLink = CONFIG.EMAIL_LINK_VERIFICATION.replace(
-        /\$1/g,
+        /{code}/g,
         emailOptIn.verificationCode.toString(),
       )
 
-      const emailSent = await this.sendAccountActivationEmail(
-        activationLink,
-        loginUser.firstName,
-        loginUser.lastName,
+      const emailSent = await sendAccountActivationEmail({
+        link: activationLink,
+        firstName: loginUser.firstName,
+        lastName: loginUser.lastName,
         email,
-      )
+      })
 
       // In case EMails are disabled log the activation link for the user
       if (!emailSent) {
@@ -545,22 +523,15 @@ export class UserResolver {
     const optInCode = await getOptInCode(loginUser)
 
     const link = CONFIG.EMAIL_LINK_SETPASSWORD.replace(
-      /\$1/g,
+      /{code}/g,
       optInCode.verificationCode.toString(),
     )
 
-    const emailSent = await sendEMail({
-      from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`,
-      to: `${loginUser.firstName} ${loginUser.lastName} <${email}>`,
-      subject: 'Gradido: Reset Password',
-      text: `Hallo ${loginUser.firstName} ${loginUser.lastName},
-      
-      Du oder jemand anderes hat für dieses Konto ein Zurücksetzen des Passworts angefordert.
-      Wenn du es warst, klicke bitte auf den Link: ${link}
-      oder kopiere den obigen Link in Dein Browserfenster.
-      
-      Mit freundlichen Grüßen,
-      dein Gradido-Team`,
+    const emailSent = await sendResetPasswordEmail({
+      link,
+      firstName: loginUser.firstName,
+      lastName: loginUser.lastName,
+      email,
     })
 
     // In case EMails are disabled log the activation link for the user
@@ -670,7 +641,12 @@ export class UserResolver {
     // TODO do we always signUp the user? How to handle things with old users?
     if (optInCode.emailOptInTypeId === EMAIL_OPT_IN_REGISTER) {
       try {
-        await signIn(loginUser.email, loginUser.language, loginUser.firstName, loginUser.lastName)
+        await klicktippSignIn(
+          loginUser.email,
+          loginUser.language,
+          loginUser.firstName,
+          loginUser.lastName,
+        )
       } catch {
         // TODO is this a problem?
         // eslint-disable-next-line no-console
@@ -738,7 +714,7 @@ export class UserResolver {
     if (password && passwordNew) {
       // TODO: This had some error cases defined - like missing private key. This is no longer checked.
       const oldPasswordHash = SecretKeyCryptographyCreateKey(loginUser.email, password)
-      if (loginUser.password !== oldPasswordHash[0].readBigUInt64LE()) {
+      if (BigInt(loginUser.password.toString()) !== oldPasswordHash[0].readBigUInt64LE()) {
         throw new Error(`Old password is invalid`)
       }
 
@@ -748,7 +724,7 @@ export class UserResolver {
       const encryptedPrivkey = SecretKeyCryptographyEncrypt(privKey, newPasswordHash[1])
 
       // Save new password hash and newly encrypted private key
-      loginUser.password = newPasswordHash[0].readBigInt64LE()
+      loginUser.password = newPasswordHash[0].readBigUInt64LE()
       loginUser.privKey = encryptedPrivkey
     }
 
diff --git a/backend/src/index.ts b/backend/src/index.ts
index a2e533e34..4c08b422d 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -13,7 +13,7 @@ async function main() {
     console.log(`Server is running at http://localhost:${CONFIG.PORT}`)
     if (CONFIG.GRAPHIQL) {
       // eslint-disable-next-line no-console
-      console.log(`GraphIQL available at http://localhost:${CONFIG.PORT}/graphql`)
+      console.log(`GraphIQL available at http://localhost:${CONFIG.PORT}`)
     }
   })
 }
diff --git a/backend/src/mailer/sendAccountActivationEmail.test.ts b/backend/src/mailer/sendAccountActivationEmail.test.ts
new file mode 100644
index 000000000..c53fc0994
--- /dev/null
+++ b/backend/src/mailer/sendAccountActivationEmail.test.ts
@@ -0,0 +1,29 @@
+import { sendAccountActivationEmail } from './sendAccountActivationEmail'
+import { sendEMail } from './sendEMail'
+
+jest.mock('./sendEMail', () => {
+  return {
+    __esModule: true,
+    sendEMail: jest.fn(),
+  }
+})
+
+describe('sendAccountActivationEmail', () => {
+  beforeEach(async () => {
+    await sendAccountActivationEmail({
+      link: 'activationLink',
+      firstName: 'Peter',
+      lastName: 'Lustig',
+      email: 'peter@lustig.de',
+    })
+  })
+
+  it('calls sendEMail', () => {
+    expect(sendEMail).toBeCalledWith({
+      to: `Peter Lustig <peter@lustig.de>`,
+      subject: 'Gradido: E-Mail Überprüfung',
+      text:
+        expect.stringContaining('Hallo Peter Lustig') && expect.stringContaining('activationLink'),
+    })
+  })
+})
diff --git a/backend/src/mailer/sendAccountActivationEmail.ts b/backend/src/mailer/sendAccountActivationEmail.ts
new file mode 100644
index 000000000..05c3104cb
--- /dev/null
+++ b/backend/src/mailer/sendAccountActivationEmail.ts
@@ -0,0 +1,15 @@
+import { sendEMail } from './sendEMail'
+import { accountActivation } from './text/accountActivation'
+
+export const sendAccountActivationEmail = (data: {
+  link: string
+  firstName: string
+  lastName: string
+  email: string
+}): Promise<boolean> => {
+  return sendEMail({
+    to: `${data.firstName} ${data.lastName} <${data.email}>`,
+    subject: accountActivation.de.subject,
+    text: accountActivation.de.text(data),
+  })
+}
diff --git a/backend/src/mailer/sendEMail.test.ts b/backend/src/mailer/sendEMail.test.ts
new file mode 100644
index 000000000..5baae00ab
--- /dev/null
+++ b/backend/src/mailer/sendEMail.test.ts
@@ -0,0 +1,92 @@
+import { sendEMail } from './sendEMail'
+import { createTransport } from 'nodemailer'
+import CONFIG from '../config'
+
+CONFIG.EMAIL = false
+CONFIG.EMAIL_SMTP_URL = 'EMAIL_SMTP_URL'
+CONFIG.EMAIL_SMTP_PORT = '1234'
+CONFIG.EMAIL_USERNAME = 'user'
+CONFIG.EMAIL_PASSWORD = 'pwd'
+
+jest.mock('nodemailer', () => {
+  return {
+    __esModule: true,
+    createTransport: jest.fn(() => {
+      return {
+        sendMail: jest.fn(() => {
+          return {
+            messageId: 'message',
+          }
+        }),
+      }
+    }),
+  }
+})
+
+describe('sendEMail', () => {
+  let result: boolean
+  describe('config email is false', () => {
+    // eslint-disable-next-line no-console
+    const consoleLog = console.log
+    const consoleLogMock = jest.fn()
+    // eslint-disable-next-line no-console
+    console.log = consoleLogMock
+    beforeEach(async () => {
+      result = await sendEMail({
+        to: 'receiver@mail.org',
+        subject: 'Subject',
+        text: 'Text text text',
+      })
+    })
+
+    afterAll(() => {
+      // eslint-disable-next-line no-console
+      console.log = consoleLog
+    })
+
+    it('logs warining to console', () => {
+      expect(consoleLogMock).toBeCalledWith('Emails are disabled via config')
+    })
+
+    it('returns false', () => {
+      expect(result).toBeFalsy()
+    })
+  })
+
+  describe('config email is true', () => {
+    beforeEach(async () => {
+      CONFIG.EMAIL = true
+      result = await sendEMail({
+        to: 'receiver@mail.org',
+        subject: 'Subject',
+        text: 'Text text text',
+      })
+    })
+
+    it('calls the transporter', () => {
+      expect(createTransport).toBeCalledWith({
+        host: 'EMAIL_SMTP_URL',
+        port: 1234,
+        secure: false,
+        requireTLS: true,
+        auth: {
+          user: 'user',
+          pass: 'pwd',
+        },
+      })
+    })
+
+    it('calls sendMail of transporter', () => {
+      expect((createTransport as jest.Mock).mock.results[0].value.sendMail).toBeCalledWith({
+        from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`,
+        to: 'receiver@mail.org',
+        subject: 'Subject',
+        text: 'Text text text',
+      })
+    })
+
+    it('returns true', () => {
+      expect(result).toBeTruthy()
+    })
+  })
+})
diff --git a/backend/src/util/sendEMail.ts b/backend/src/mailer/sendEMail.ts
similarity index 85%
rename from backend/src/util/sendEMail.ts
rename to backend/src/mailer/sendEMail.ts
index 4c239980d..e26589347 100644
--- a/backend/src/util/sendEMail.ts
+++ b/backend/src/mailer/sendEMail.ts
@@ -3,7 +3,6 @@ import { createTransport } from 'nodemailer'
 import CONFIG from '../config'
 
 export const sendEMail = async (emailDef: {
-  from: string
   to: string
   subject: string
   text: string
@@ -23,7 +22,10 @@ export const sendEMail = async (emailDef: {
       pass: CONFIG.EMAIL_PASSWORD,
     },
   })
-  const info = await transporter.sendMail(emailDef)
+  const info = await transporter.sendMail({
+    ...emailDef,
+    from: `Gradido (nicht antworten) <${CONFIG.EMAIL_SENDER}>`,
+  })
   if (!info.messageId) {
     throw new Error('error sending notification email, but transaction succeed')
   }
diff --git a/backend/src/mailer/sendResetPasswordEmail.test.ts b/backend/src/mailer/sendResetPasswordEmail.test.ts
new file mode 100644
index 000000000..4bc8ceba0
--- /dev/null
+++ b/backend/src/mailer/sendResetPasswordEmail.test.ts
@@ -0,0 +1,28 @@
+import { sendResetPasswordEmail } from './sendResetPasswordEmail'
+import { sendEMail } from './sendEMail'
+
+jest.mock('./sendEMail', () => {
+  return {
+    __esModule: true,
+    sendEMail: jest.fn(),
+  }
+})
+
+describe('sendResetPasswordEmail', () => {
+  beforeEach(async () => {
+    await sendResetPasswordEmail({
+      link: 'resetLink',
+      firstName: 'Peter',
+      lastName: 'Lustig',
+      email: 'peter@lustig.de',
+    })
+  })
+
+  it('calls sendEMail', () => {
+    expect(sendEMail).toBeCalledWith({
+      to: `Peter Lustig <peter@lustig.de>`,
+      subject: 'Gradido: Passwort zurücksetzen',
+      text: expect.stringContaining('Hallo Peter Lustig') && expect.stringContaining('resetLink'),
+    })
+  })
+})
diff --git a/backend/src/mailer/sendResetPasswordEmail.ts b/backend/src/mailer/sendResetPasswordEmail.ts
new file mode 100644
index 000000000..c9f5b23e9
--- /dev/null
+++ b/backend/src/mailer/sendResetPasswordEmail.ts
@@ -0,0 +1,15 @@
+import { sendEMail } from './sendEMail'
+import { resetPassword } from './text/resetPassword'
+
+export const sendResetPasswordEmail = (data: {
+  link: string
+  firstName: string
+  lastName: string
+  email: string
+}): Promise<boolean> => {
+  return sendEMail({
+    to: `${data.firstName} ${data.lastName} <${data.email}>`,
+    subject: resetPassword.de.subject,
+    text: resetPassword.de.text(data),
+  })
+}
diff --git a/backend/src/mailer/sendTransactionReceivedEmail.test.ts b/backend/src/mailer/sendTransactionReceivedEmail.test.ts
new file mode 100644
index 000000000..29f227185
--- /dev/null
+++ b/backend/src/mailer/sendTransactionReceivedEmail.test.ts
@@ -0,0 +1,35 @@
+import { sendTransactionReceivedEmail } from './sendTransactionReceivedEmail'
+import { sendEMail } from './sendEMail'
+
+jest.mock('./sendEMail', () => {
+  return {
+    __esModule: true,
+    sendEMail: jest.fn(),
+  }
+})
+
+describe('sendTransactionReceivedEmail', () => {
+  beforeEach(async () => {
+    await sendTransactionReceivedEmail({
+      senderFirstName: 'Bibi',
+      senderLastName: 'Bloxberg',
+      recipientFirstName: 'Peter',
+      recipientLastName: 'Lustig',
+      email: 'peter@lustig.de',
+      amount: 42.0,
+      memo: 'Vielen herzlichen Dank für den neuen Hexenbesen!',
+    })
+  })
+
+  it('calls sendEMail', () => {
+    expect(sendEMail).toBeCalledWith({
+      to: `Peter Lustig <peter@lustig.de>`,
+      subject: 'Gradido Überweisung',
+      text:
+        expect.stringContaining('Hallo Peter Lustig') &&
+        expect.stringContaining('42,00 GDD') &&
+        expect.stringContaining('Bibi Bloxberg') &&
+        expect.stringContaining('Vielen herzlichen Dank für den neuen Hexenbesen!'),
+    })
+  })
+})
diff --git a/backend/src/mailer/sendTransactionReceivedEmail.ts b/backend/src/mailer/sendTransactionReceivedEmail.ts
new file mode 100644
index 000000000..3560f6548
--- /dev/null
+++ b/backend/src/mailer/sendTransactionReceivedEmail.ts
@@ -0,0 +1,18 @@
+import { sendEMail } from './sendEMail'
+import { transactionReceived } from './text/transactionReceived'
+
+export const sendTransactionReceivedEmail = (data: {
+  senderFirstName: string
+  senderLastName: string
+  recipientFirstName: string
+  recipientLastName: string
+  email: string
+  amount: number
+  memo: string
+}): Promise<boolean> => {
+  return sendEMail({
+    to: `${data.recipientFirstName} ${data.recipientLastName} <${data.email}>`,
+    subject: transactionReceived.de.subject,
+    text: transactionReceived.de.text(data),
+  })
+}
diff --git a/backend/src/mailer/text/accountActivation.ts b/backend/src/mailer/text/accountActivation.ts
new file mode 100644
index 000000000..c4f70ff0f
--- /dev/null
+++ b/backend/src/mailer/text/accountActivation.ts
@@ -0,0 +1,16 @@
+export const accountActivation = {
+  de: {
+    subject: 'Gradido: E-Mail Überprüfung',
+    text: (data: { link: string; firstName: string; lastName: string; email: string }): string =>
+      `Hallo ${data.firstName} ${data.lastName},
+
+Deine EMail wurde soeben bei Gradido registriert.
+
+Klicke bitte auf diesen Link, um die Registrierung abzuschließen und dein Gradido-Konto zu aktivieren:
+${data.link}
+oder kopiere den obigen Link in dein Browserfenster.
+
+Mit freundlichen Grüßen,
+dein Gradido-Team`,
+  },
+}
diff --git a/backend/src/mailer/text/resetPassword.ts b/backend/src/mailer/text/resetPassword.ts
new file mode 100644
index 000000000..58b13cbcd
--- /dev/null
+++ b/backend/src/mailer/text/resetPassword.ts
@@ -0,0 +1,14 @@
+export const resetPassword = {
+  de: {
+    subject: 'Gradido: Passwort zurücksetzen',
+    text: (data: { link: string; firstName: string; lastName: string; email: string }): string =>
+      `Hallo ${data.firstName} ${data.lastName},
+
+Du oder jemand anderes hat für dieses Konto ein Zurücksetzen des Passworts angefordert.
+Wenn du es warst, klicke bitte auf den Link: ${data.link}
+oder kopiere den obigen Link in Dein Browserfenster.
+
+Mit freundlichen Grüßen,
+dein Gradido-Team`,
+  },
+}
diff --git a/backend/src/mailer/text/transactionReceived.ts b/backend/src/mailer/text/transactionReceived.ts
new file mode 100644
index 000000000..3df2b718a
--- /dev/null
+++ b/backend/src/mailer/text/transactionReceived.ts
@@ -0,0 +1,27 @@
+export const transactionReceived = {
+  de: {
+    subject: 'Gradido Überweisung',
+    text: (data: {
+      senderFirstName: string
+      senderLastName: string
+      recipientFirstName: string
+      recipientLastName: string
+      email: string
+      amount: number
+      memo: string
+    }): string =>
+      `Hallo ${data.recipientFirstName} ${data.recipientLastName}
+
+Du hast soeben ${data.amount.toFixed(2).replace('.', ',')} GDD von ${data.senderFirstName} ${
+        data.senderLastName
+      } erhalten.
+${data.senderFirstName} ${data.senderLastName} schreibt:
+
+${data.memo}
+
+Bitte antworte nicht auf diese E-Mail!
+
+Mit freundlichen Grüßen,
+dein Gradido-Team`,
+  },
+}
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index 69a74480d..d0fde8195 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -1,5 +1,5 @@
 import { MiddlewareFn } from 'type-graphql'
-import { /* signIn, */ getKlickTippUser } from '../apis/KlicktippController'
+import { /* klicktippSignIn, */ getKlickTippUser } from '../apis/KlicktippController'
 import { KlickTipp } from '../graphql/model/KlickTipp'
 import CONFIG from '../config/index'
 
@@ -12,7 +12,7 @@ import CONFIG from '../config/index'
 //   // Do Something here before resolver is called
 //   const result = await next()
 //   // Do Something here after resolver is completed
-//   await signIn(result.email, result.language, result.firstName, result.lastName)
+//   await klicktippSignIn(result.email, result.language, result.firstName, result.lastName)
 //   return result
 // }
 
diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts
index 4ed20232d..c7459b189 100644
--- a/backend/src/server/createServer.ts
+++ b/backend/src/server/createServer.ts
@@ -6,7 +6,6 @@ import 'module-alias/register'
 
 import { ApolloServer } from 'apollo-server-express'
 import express from 'express'
-import bodyParser from 'body-parser'
 
 // database
 import connection from '../typeorm/connection'
@@ -54,8 +53,19 @@ const createServer = async (context: any = serverContext): Promise<any> => {
   // cors
   app.use(cors)
 
-  // bodyparser
-  app.use(bodyParser.json())
+  // bodyparser json
+  app.use(express.json())
+  // bodyparser text for elopage
+  app.use(express.text())
+
+  // Log every request
+  /*
+  app.use((req, res, next) => {
+    // eslint-disable-next-line no-console
+    console.log(req)
+    next()
+  })
+  */
 
   // Elopage Webhook
   app.post('/hook/elopage/' + CONFIG.WEBHOOK_ELOPAGE_SECRET, elopageWebhook)
@@ -64,10 +74,11 @@ const createServer = async (context: any = serverContext): Promise<any> => {
   const apollo = new ApolloServer({
     schema: await schema(),
     playground: CONFIG.GRAPHIQL,
+    introspection: CONFIG.GRAPHIQL,
     context,
     plugins,
   })
-  apollo.applyMiddleware({ app })
+  apollo.applyMiddleware({ app, path: '/' })
   return { apollo, app, con }
 }
 
diff --git a/backend/src/server/plugins.ts b/backend/src/server/plugins.ts
index 5436d595b..0bb5f9f98 100644
--- a/backend/src/server/plugins.ts
+++ b/backend/src/server/plugins.ts
@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 
+import { ApolloLogPlugin } from 'apollo-log'
+
 const plugins = [
   {
     requestDidStart() {
@@ -8,13 +10,18 @@ const plugins = [
         willSendResponse(requestContext: any) {
           const { setHeaders = [] } = requestContext.context
           setHeaders.forEach(({ key, value }: { [key: string]: string }) => {
-            requestContext.response.http.headers.append(key, value)
+            if (requestContext.response.http.headers.get(key)) {
+              requestContext.response.http.headers.set(key, value)
+            } else {
+              requestContext.response.http.headers.append(key, value)
+            }
           })
           return requestContext
         },
       }
     },
   },
+  ApolloLogPlugin(),
 ]
 
 export default plugins
diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts
index 5709c29b6..65e3feb1c 100644
--- a/backend/src/typeorm/connection.ts
+++ b/backend/src/typeorm/connection.ts
@@ -1,4 +1,4 @@
-import { createConnection, Connection } from 'typeorm'
+import { createConnection, Connection, FileLogger } from 'typeorm'
 import CONFIG from '../config'
 import { entities } from '@entity/index'
 
@@ -15,6 +15,10 @@ const connection = async (): Promise<Connection | null> => {
       database: CONFIG.DB_DATABASE,
       entities,
       synchronize: false,
+      logging: true,
+      logger: new FileLogger('all', {
+        logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH,
+      }),
     })
   } catch (error) {
     // eslint-disable-next-line no-console
diff --git a/backend/src/typeorm/repository/UserTransaction.ts b/backend/src/typeorm/repository/UserTransaction.ts
index 57f89d5a5..386145d03 100644
--- a/backend/src/typeorm/repository/UserTransaction.ts
+++ b/backend/src/typeorm/repository/UserTransaction.ts
@@ -1,6 +1,7 @@
 import { EntityRepository, Repository } from 'typeorm'
 import { Order } from '../../graphql/enum/Order'
 import { UserTransaction } from '@entity/UserTransaction'
+import { TransactionTypeId } from '../../graphql/enum/TransactionTypeId'
 
 @EntityRepository(UserTransaction)
 export class UserTransactionRepository extends Repository<UserTransaction> {
@@ -14,7 +15,9 @@ export class UserTransactionRepository extends Repository<UserTransaction> {
     if (onlyCreation) {
       return this.createQueryBuilder('userTransaction')
         .where('userTransaction.userId = :userId', { userId })
-        .andWhere('userTransaction.type = "creation"')
+        .andWhere('userTransaction.transactionTypeId = :transactionTypeId', {
+          transactionTypeId: TransactionTypeId.CREATION,
+        })
         .orderBy('userTransaction.balanceDate', order)
         .limit(limit)
         .offset(offset)
diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts
index 80fa90933..6f5b96e5f 100644
--- a/backend/src/webhook/elopage.ts
+++ b/backend/src/webhook/elopage.ts
@@ -28,19 +28,23 @@
 */
 
 import { LoginElopageBuys } from '@entity/LoginElopageBuys'
-import { LoginUser } from '@entity/LoginUser'
+import { getCustomRepository } from 'typeorm'
 import { UserResolver } from '../graphql/resolver/UserResolver'
+import { LoginElopageBuysRepository } from '../typeorm/repository/LoginElopageBuys'
+import { LoginUserRepository } from '../typeorm/repository/LoginUser'
 
 export const elopageWebhook = async (req: any, res: any): Promise<void> => {
+  // eslint-disable-next-line no-console
+  console.log('Elopage Hook received', req.body)
   res.status(200).end() // Responding is important
-
+  const loginElopgaeBuyRepository = await getCustomRepository(LoginElopageBuysRepository)
   const loginElopgaeBuy = new LoginElopageBuys()
   let firstName = ''
   let lastName = ''
   const entries = req.body.split('&')
-  entries.foreach((entry: string) => {
+  entries.forEach((entry: string) => {
     const keyVal = entry.split('=')
-    if (keyVal.length !== 2) {
+    if (keyVal.length > 2) {
       throw new Error(`Error parsing entry '${entry}'`)
     }
     const key = keyVal[0]
@@ -88,8 +92,10 @@ export const elopageWebhook = async (req: any, res: any): Promise<void> => {
         lastName = val
         break
       default:
+        // this is too spammy
         // eslint-disable-next-line no-console
-        console.log(`Unknown Elopage Value '${entry}'`)
+        // console.log(`Unknown Elopage Value '${entry}'`)
+        break
     }
   })
 
@@ -101,7 +107,7 @@ export const elopageWebhook = async (req: any, res: any): Promise<void> => {
   }
 
   // Save the hook data
-  await loginElopgaeBuy.save()
+  await loginElopgaeBuyRepository.save(loginElopgaeBuy)
 
   // create user for certain products
   /*
@@ -133,7 +139,8 @@ export const elopageWebhook = async (req: any, res: any): Promise<void> => {
     }
 
     // Do we already have such a user?
-    if ((await LoginUser.count({ email })) !== 0) {
+    const loginUserRepository = await getCustomRepository(LoginUserRepository)
+    if ((await loginUserRepository.count({ email })) !== 0) {
       // eslint-disable-next-line no-console
       console.log(`Did not create User - already exists with email: ${email}`)
       return
diff --git a/backend/yarn.lock b/backend/yarn.lock
index b46bc183d..e01796c0c 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@apollo/protobufjs@1.2.2":
+"@apollo/protobufjs@1.2.2", "@apollo/protobufjs@^1.0.3":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.2.tgz#4bd92cd7701ccaef6d517cdb75af2755f049f87c"
   integrity sha512-vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ==
@@ -1273,6 +1273,24 @@ apollo-link@^1.2.14:
     tslib "^1.9.3"
     zen-observable-ts "^0.8.21"
 
+apollo-log@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/apollo-log/-/apollo-log-1.1.0.tgz#e21287c917cf735b77adc06f07034f965e9b24de"
+  integrity sha512-TciLu+85LSqk7t7ZGKrYN5jFiCcRMLujBjrLiOQGHGgVVkvmKlwK0oELSS9kiHQIhTq23p8qVVWb08spLpQ7Jw==
+  dependencies:
+    apollo-server-plugin-base "^0.10.4"
+    chalk "^4.1.0"
+    fast-safe-stringify "^2.0.7"
+    loglevelnext "^4.0.1"
+    nanoid "^3.1.20"
+
+apollo-reporting-protobuf@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.2.tgz#5572866be9b77f133916532b10e15fbaa4158304"
+  integrity sha512-WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw==
+  dependencies:
+    "@apollo/protobufjs" "^1.0.3"
+
 apollo-reporting-protobuf@^0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.8.0.tgz#ae9d967934d3d8ed816fc85a0d8068ef45c371b9"
@@ -1280,6 +1298,13 @@ apollo-reporting-protobuf@^0.8.0:
   dependencies:
     "@apollo/protobufjs" "1.2.2"
 
+apollo-server-caching@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz#cf42a77ad09a46290a246810075eaa029b5305e1"
+  integrity sha512-iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 apollo-server-caching@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz#e6d1e68e3bb571cba63a61f60b434fb771c6ff39"
@@ -1318,7 +1343,7 @@ apollo-server-core@^2.25.2:
     subscriptions-transport-ws "^0.9.19"
     uuid "^8.0.0"
 
-apollo-server-env@^3.1.0:
+apollo-server-env@^3.0.0, apollo-server-env@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-3.1.0.tgz#0733c2ef50aea596cc90cf40a53f6ea2ad402cd0"
   integrity sha512-iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ==
@@ -1354,6 +1379,13 @@ apollo-server-express@^2.25.2:
     subscriptions-transport-ws "^0.9.19"
     type-is "^1.6.16"
 
+apollo-server-plugin-base@^0.10.4:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.4.tgz#fbf73f64f95537ca9f9639dd7c535eb5eeb95dcd"
+  integrity sha512-HRhbyHgHFTLP0ImubQObYhSgpmVH4Rk1BinnceZmwudIVLKrqayIVOELdyext/QnSmmzg5W7vF3NLGBcVGMqDg==
+  dependencies:
+    apollo-server-types "^0.6.3"
+
 apollo-server-plugin-base@^0.13.0:
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.13.0.tgz#3f85751a420d3c4625355b6cb3fbdd2acbe71f13"
@@ -1368,6 +1400,15 @@ apollo-server-testing@^2.25.2:
   dependencies:
     apollo-server-core "^2.25.2"
 
+apollo-server-types@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.6.3.tgz#f7aa25ff7157863264d01a77d7934aa6e13399e8"
+  integrity sha512-aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg==
+  dependencies:
+    apollo-reporting-protobuf "^0.6.2"
+    apollo-server-caching "^0.5.3"
+    apollo-server-env "^3.0.0"
+
 apollo-server-types@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.9.0.tgz#ccf550b33b07c48c72f104fbe2876232b404848b"
@@ -1552,7 +1593,7 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
-body-parser@1.19.0, body-parser@^1.18.3, body-parser@^1.19.0:
+body-parser@1.19.0, body-parser@^1.18.3:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
   integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
@@ -2559,6 +2600,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fast-safe-stringify@^2.0.7:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
+  integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
+
 fastq@^1.6.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
@@ -4008,6 +4054,11 @@ loglevel@^1.6.7:
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
   integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==
 
+loglevelnext@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/loglevelnext/-/loglevelnext-4.0.1.tgz#4406c6348c243a35272ac75d7d8e4e60ecbcd011"
+  integrity sha512-/tlMUn5wqgzg9msy0PiWc+8fpVXEuYPq49c2RGyw2NAh0hSrgq6j/Z3YPnwWsILMoFJ+ZT6ePHnWUonkjDnq2Q==
+
 long@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
@@ -4194,6 +4245,11 @@ named-placeholders@^1.1.2:
   dependencies:
     lru-cache "^4.1.3"
 
+nanoid@^3.1.20:
+  version "3.1.32"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.32.tgz#8f96069e6239cc0a9ae8c0d3b41a3b4933a88c0a"
+  integrity sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
diff --git a/community_server/src/Template/Pages/js.ctp b/community_server/src/Template/Pages/js.ctp
index 60868adc4..dd1525dbe 100644
--- a/community_server/src/Template/Pages/js.ctp
+++ b/community_server/src/Template/Pages/js.ctp
@@ -37,5 +37,5 @@
 </div>
 <!-- built files will be auto injected -->
 <script type="text/javascript">csfr = "<?= $this->request->getParam('_csrfToken') ?>";</script>
-<script type="text/javascript" src="/vue/app.js"></script></body>
+<script type="text/javascript" src="/app.js"></script></body>
 </html>
diff --git a/database/.env.template b/database/.env.template
new file mode 100644
index 000000000..5b8554bcf
--- /dev/null
+++ b/database/.env.template
@@ -0,0 +1,8 @@
+DB_HOST=localhost
+DB_PORT=3306
+DB_USER=$DB_USER
+DB_PASSWORD=$DB_PASSWORD
+DB_DATABASE=gradido_community
+MIGRATIONS_TABLE=migrations
+
+TYPEORM_SEEDING_FACTORIES=src/factories/**/*{.ts,.js}
diff --git a/database/src/factories/login-user.factory.ts b/database/src/factories/login-user.factory.ts
index a5a28943e..b3c0312f3 100644
--- a/database/src/factories/login-user.factory.ts
+++ b/database/src/factories/login-user.factory.ts
@@ -19,7 +19,7 @@ define(LoginUser, (faker: typeof Faker, context?: LoginUserContext) => {
   user.privKey = context.privKey ? context.privKey : randomBytes(80)
   user.emailHash = context.emailHash ? context.emailHash : randomBytes(32)
   user.createdAt = context.createdAt ? context.createdAt : faker.date.recent()
-  user.emailChecked = context.emailChecked ? context.emailChecked : true
+  user.emailChecked = context.emailChecked === undefined ? false : context.emailChecked
   user.passphraseShown = context.passphraseShown ? context.passphraseShown : false
   user.language = context.language ? context.language : 'en'
   user.disabled = context.disabled ? context.disabled : false
diff --git a/database/src/index.ts b/database/src/index.ts
index 488d098d3..fefdea217 100644
--- a/database/src/index.ts
+++ b/database/src/index.ts
@@ -6,6 +6,8 @@ import { CreatePeterLustigSeed } from './seeds/users/peter-lustig.admin.seed'
 import { CreateBibiBloxbergSeed } from './seeds/users/bibi-bloxberg.seed'
 import { CreateRaeuberHotzenplotzSeed } from './seeds/users/raeuber-hotzenplotz.seed'
 import { CreateBobBaumeisterSeed } from './seeds/users/bob-baumeister.seed'
+import { CreateGarrickOllivanderSeed } from './seeds/users/garrick-ollivander.seed'
+import { CreateUserSeed } from './seeds/create-user.seed'
 import { DecayStartBlockSeed } from './seeds/decay-start-block.seed'
 import { resetDB, pool, migration } from './helpers'
 
@@ -44,6 +46,11 @@ const run = async (command: string) => {
       await runSeeder(CreateBibiBloxbergSeed)
       await runSeeder(CreateRaeuberHotzenplotzSeed)
       await runSeeder(CreateBobBaumeisterSeed)
+      // eslint-disable-next-line prefer-spread
+      Array.apply(null, Array(96)).forEach(async () => {
+        await runSeeder(CreateUserSeed)
+      })
+      await runSeeder(CreateGarrickOllivanderSeed)
       break
     default:
       throw new Error(`Unsupported command ${command}`)
diff --git a/database/src/interface/UserContext.ts b/database/src/interface/UserContext.ts
index 4e188904c..eb4323aee 100644
--- a/database/src/interface/UserContext.ts
+++ b/database/src/interface/UserContext.ts
@@ -23,7 +23,7 @@ export interface LoginUserContext {
   language?: string
   disabled?: boolean
   groupId?: number
-  publisherId?: number | null
+  publisherId?: number
 }
 
 export interface LoginUserBackupContext {
diff --git a/database/src/interface/UserInterface.ts b/database/src/interface/UserInterface.ts
index 70be6cff4..63804af6b 100644
--- a/database/src/interface/UserInterface.ts
+++ b/database/src/interface/UserInterface.ts
@@ -15,7 +15,7 @@ export interface UserInterface {
   language?: string
   disabled?: boolean
   groupId?: number
-  publisherId?: number | null
+  publisherId?: number
   // from login user backup
   passphrase?: string
   mnemonicType?: number
diff --git a/database/src/seeds/create-user.seed.ts b/database/src/seeds/create-user.seed.ts
index ca3a182c4..69488a790 100644
--- a/database/src/seeds/create-user.seed.ts
+++ b/database/src/seeds/create-user.seed.ts
@@ -1,11 +1,8 @@
 import { Factory, Seeder } from 'typeorm-seeding'
-import { User } from '../../entity/User'
-// import { LoginUser } from '../../entity/LoginUser'
+import { userSeeder } from './helpers/user-helpers'
 
 export class CreateUserSeed implements Seeder {
   public async run(factory: Factory): Promise<void> {
-    // const loginUser = await factory(LoginUser)().make()
-    // console.log(loginUser.email)
-    await factory(User)().create()
+    await userSeeder(factory, {})
   }
 }
diff --git a/database/src/seeds/helpers/user-helpers.ts b/database/src/seeds/helpers/user-helpers.ts
index bd46ecdee..e1e33a94b 100644
--- a/database/src/seeds/helpers/user-helpers.ts
+++ b/database/src/seeds/helpers/user-helpers.ts
@@ -27,6 +27,7 @@ import { Factory } from 'typeorm-seeding'
 
 export const userSeeder = async (factory: Factory, userData: UserInterface): Promise<void> => {
   const user = await factory(User)(createUserContext(userData)).create()
+  if (!userData.email) userData.email = user.email
   const loginUser = await factory(LoginUser)(createLoginUserContext(userData)).create()
   await factory(LoginUserBackup)(createLoginUserBackupContext(userData, loginUser)).create()
 
diff --git a/database/src/seeds/users/bibi-bloxberg.ts b/database/src/seeds/users/bibi-bloxberg.ts
index 30ad4eb4c..221349cb7 100644
--- a/database/src/seeds/users/bibi-bloxberg.ts
+++ b/database/src/seeds/users/bibi-bloxberg.ts
@@ -17,7 +17,6 @@ export const bibiBloxberg = {
   language: 'de',
   disabled: false,
   groupId: 1,
-  publisherId: null,
   passphrase:
     'knife normal level all hurdle crucial color avoid warrior stadium road bachelor affair topple hawk pottery right afford immune two ceiling budget glance hour ',
   mnemonicType: 2,
diff --git a/database/src/seeds/users/bob-baumeister.ts b/database/src/seeds/users/bob-baumeister.ts
index a6933d7c1..013636079 100644
--- a/database/src/seeds/users/bob-baumeister.ts
+++ b/database/src/seeds/users/bob-baumeister.ts
@@ -17,7 +17,6 @@ export const bobBaumeister = {
   language: 'de',
   disabled: false,
   groupId: 1,
-  publisherId: null,
   passphrase:
     'detail master source effort unable waste tilt flush domain orchard art truck hint barrel response gate impose peanut secret merry three uncle wink resource ',
   mnemonicType: 2,
diff --git a/database/src/seeds/users/garrick-ollivander.seed.ts b/database/src/seeds/users/garrick-ollivander.seed.ts
new file mode 100644
index 000000000..54adc3475
--- /dev/null
+++ b/database/src/seeds/users/garrick-ollivander.seed.ts
@@ -0,0 +1,9 @@
+import { Factory, Seeder } from 'typeorm-seeding'
+import { garrickOllivander } from './garrick-ollivander'
+import { userSeeder } from '../helpers/user-helpers'
+
+export class CreateGarrickOllivanderSeed implements Seeder {
+  public async run(factory: Factory): Promise<void> {
+    await userSeeder(factory, garrickOllivander)
+  }
+}
diff --git a/database/src/seeds/users/garrick-ollivander.ts b/database/src/seeds/users/garrick-ollivander.ts
new file mode 100644
index 000000000..1c7bbb9fc
--- /dev/null
+++ b/database/src/seeds/users/garrick-ollivander.ts
@@ -0,0 +1,21 @@
+export const garrickOllivander = {
+  email: 'garrick@ollivander.com',
+  firstName: 'Garrick',
+  lastName: 'Ollivander',
+  username: 'garrick',
+  description: `Curious ... curious ...
+Renowned wandmaker Mr Ollivander owns the wand shop Ollivanders: Makers of Fine Wands Since 382 BC in Diagon Alley. His shop is widely considered the best place to purchase a wand.`,
+  password: BigInt('0'),
+  emailHash: Buffer.from('91e358000e908146342789979d62a7255b2b88a71dad0c6a10e32af44be57886', 'hex'),
+  createdAt: new Date('2022-01-10T10:23:17'),
+  emailChecked: false,
+  passphraseShown: false,
+  language: 'en',
+  disabled: false,
+  groupId: 1,
+  passphrase:
+    'human glide theory clump wish history other duty door fringe neck industry ostrich equal plate diesel tornado neck people antenna door category moon hen ',
+  mnemonicType: 2,
+  isAdmin: false,
+  addBalance: false,
+}
diff --git a/database/src/seeds/users/peter-lustig.ts b/database/src/seeds/users/peter-lustig.ts
index 63caf55f6..c96b28a65 100644
--- a/database/src/seeds/users/peter-lustig.ts
+++ b/database/src/seeds/users/peter-lustig.ts
@@ -17,7 +17,6 @@ export const peterLustig = {
   language: 'de',
   disabled: false,
   groupId: 1,
-  publisherId: null,
   passphrase:
     'okay property choice naive calm present weird increase stuff royal vibrant frame attend wood one else tribe pull hedgehog woman kitchen hawk snack smart ',
   mnemonicType: 2,
diff --git a/database/src/seeds/users/raeuber-hotzenplotz.ts b/database/src/seeds/users/raeuber-hotzenplotz.ts
index eb2118af5..c1f31b490 100644
--- a/database/src/seeds/users/raeuber-hotzenplotz.ts
+++ b/database/src/seeds/users/raeuber-hotzenplotz.ts
@@ -17,7 +17,6 @@ export const raeuberHotzenplotz = {
   language: 'de',
   disabled: false,
   groupId: 1,
-  publisherId: null,
   passphrase:
     'gospel trip tenant mouse spider skill auto curious man video chief response same little over expire drum display fancy clinic keen throw urge basket ',
   mnemonicType: 2,
diff --git a/deployment/bare_metal/.env.dist b/deployment/bare_metal/.env.dist
new file mode 100644
index 000000000..4e737a95e
--- /dev/null
+++ b/deployment/bare_metal/.env.dist
@@ -0,0 +1,39 @@
+GRADIDO_LOG_PATH=/home/gradido/gradido/deployment/bare_metal/log
+
+# start script
+DEPLOY_SEED_DATA=false
+
+# nginx
+NGINX_REWRITE_LEGACY_URLS=true
+NGINX_SSL=true
+NGINX_SERVER_NAME=stage1.gradido.net
+NGINX_SSL_CERTIFICATE=/etc/letsencrypt/live/stage1.gradido.net/fullchain.pem
+NGINX_SSL_CERTIFICATE_KEY=/etc/letsencrypt/live/stage1.gradido.net/privkey.pem
+NGINX_SSL_DHPARAM=/etc/letsencrypt/ssl-dhparams.pem
+NGINX_SSL_INCLUDE=/etc/letsencrypt/options-ssl-nginx.conf
+NGINX_UPDATE_PAGE_ROOT=/home/gradido/gradido/deployment/bare_metal/nginx/update-page
+
+# webhook
+WEBHOOK_GITHUB_SECRET=secret
+WEBHOOK_GITHUB_BRANCH=master
+
+# backend
+EMAIL=true
+EMAIL_USERNAME=peter@lustig.de
+EMAIL_SENDER=peter@lustig.de
+EMAIL_PASSWORD=1234
+EMAIL_SMTP_URL=smtp.lustig.de
+EMAIL_LINK_VERIFICATION=https://stage1.gradido.net/checkEmail/{code}
+EMAIL_LINK_SETPASSWORD=https://stage1.gradido.net/reset/{code}
+
+TYPEORM_LOGGING_RELATIVE_PATH=../deployment/bare_metal/log/typeorm.backend.log
+
+WEBHOOK_ELOPAGE_SECRET=secret
+
+# frontend
+GRAPHQL_URI=https://stage1.gradido.net/graphql
+ADMIN_AUTH_URL=https://stage1.gradido.net/admin/authenticate?token={token}
+
+# admin
+WALLET_AUTH_URL=https://stage1.gradido.net/authenticate?token={token}
+WALLET_URL=https://stage1.gradido.net/login
\ No newline at end of file
diff --git a/deployment/bare_metal/backup.sh b/deployment/bare_metal/backup.sh
new file mode 100755
index 000000000..f562b033a
--- /dev/null
+++ b/deployment/bare_metal/backup.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# This script will shut down all services, backup the whole database and restart the services
+
+# Find current directory & configure paths
+set -o allexport
+SCRIPT_PATH=$(realpath $0)
+SCRIPT_DIR=$(dirname $SCRIPT_PATH)
+PROJECT_ROOT=$SCRIPT_DIR/../..
+set +o allexport
+
+# Load backend .env for DB_USERNAME, DB_PASSWORD & DB_DATABASE
+# NOTE: all config values will be in process.env when starting
+# the services and will therefore take precedence over the .env
+if [ -f "$PROJECT_ROOT/backend/.env" ]; then
+    export $(cat $PROJECT_ROOT/backend/.env | sed 's/#.*//g' | xargs)
+else
+    export $(cat $PROJECT_ROOT/backend/.env.dist | sed 's/#.*//g' | xargs)
+fi
+
+# Stop Services
+pm2 stop gradido-backend
+
+# Backup data
+mysqldump --databases --single-transaction --quick --lock-tables=false > ${SCRIPT_DIR}/backup/mariadb-backup-$(date +%d-%m-%Y_%H-%M-%S).sql -u ${DB_USER} -p${DB_PASSWORD} ${DB_DATABASE}
+
+# Start Services
+pm2 start gradido-backend
\ No newline at end of file
diff --git a/deployment/bare_metal/backup/.gitkeep b/deployment/bare_metal/backup/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/deployment/bare_metal/build_and_start_login_server.sh b/deployment/bare_metal/build_and_start_login_server.sh
deleted file mode 100755
index b97d1d4a9..000000000
--- a/deployment/bare_metal/build_and_start_login_server.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# stop login_server running in screen
-screen -XS login quit
-
-# rebuild login-server
-cd ../../login_server
-if [ ! -d "./build" ] ; then
-  cd scripts
-  ./prepare_build.sh
-  cd ..
-fi
-cd build
-cmake ..
-make -j$(nproc) Gradido_LoginServer
-
-# rebuild locales
-cd ../scripts
-./compile_pot.sh
-cd ../src/LOCALE
-cp *.mo *.po /etc/grd_login/LOCALE/
-
-cd ../../build/bin
-
-# start login-server
-screen -dmS 'login_server' bash -c './Gradido_LoginServer'
-
-
-
diff --git a/deployment/bare_metal/install.sh b/deployment/bare_metal/install.sh
new file mode 100755
index 000000000..b6ea5cd78
--- /dev/null
+++ b/deployment/bare_metal/install.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# This install script requires the minimum requirements already installed.
+# How to do this is described in detail in [setup.md](./setup.md)
+
+# Find current directory & configure paths
+set -o allexport
+SCRIPT_PATH=$(realpath $0)
+SCRIPT_DIR=$(dirname $SCRIPT_PATH)
+PROJECT_ROOT=$SCRIPT_DIR/../..
+set +o allexport
+
+# Load .env or .env.dist if not present
+# NOTE: all config values will be in process.env when starting
+# the services and will therefore take precedence over the .env
+if [ -f "$SCRIPT_DIR/.env" ]; then
+    export $(cat $SCRIPT_DIR/.env | sed 's/#.*//g' | xargs)
+else
+    export $(cat $SCRIPT_DIR/.env.dist | sed 's/#.*//g' | xargs)
+fi
+
+# Configure git
+git config pull.ff only
+
+# Install mariadb
+sudo apt-get install -y mariadb-server
+sudo mysql_secure_installation
+# Enter current password for root (enter for none): enter
+# Switch to unix_socket authentication [Y/n] Y
+# Change the root password? [Y/n] n
+# Remove anonymous users? [Y/n] Y
+# Disallow root login remotely? [Y/n] Y
+# Remove test database and access to it? [Y/n] Y
+# Reload privilege tables now? [Y/n] Y
+
+# Install nginx
+sudo apt-get install -y nginx
+sudo rm /etc/nginx/sites-enabled/default
+sudo ln -s /home/gradido/gradido/deployment/bare_metal/nginx/sites-available/gradido.conf /etc/nginx/sites-available
+# sudo ln -s /etc/nginx/sites-available/gradido.conf /etc/nginx/sites-enabled
+sudo ln -s /home/gradido/gradido/deployment/bare_metal/nginx/sites-available/update-page.conf /etc/nginx/sites-available
+sudo ln -s /home/gradido/gradido/deployment/bare_metal/nginx/common /etc/nginx/
+sudo rmdir /etc/nginx/conf.d
+sudo ln -s /home/gradido/gradido/deployment/bare_metal/nginx/conf.d /etc/nginx/
+
+# Allow nginx configuration and restart for gradido
+#TODO generate file
+sudo nano /etc/sudoers.d/gradido
+> gradido ALL=(ALL) NOPASSWD: /etc/init.d/nginx start,/etc/init.d/nginx stop,/etc/init.d/nginx restart
+sudo chmod a+rw /etc/nginx/sites-enabled
+
+# Install node 16.x
+curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
+sudo apt-get install -y nodejs
+sudo apt-get install -y build-essential
+
+# Install yarn
+sudo apt-get install -y curl
+sudo apt-get install -y gnupg
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+sudo apt-get update
+sudo apt-get install -y yarn
+
+# Install pm2
+sudo yarn global add pm2
+pm2 startup
+> execute command output in shell
+
+# Install certbot
+sudo apt-get install -y certbot
+sudo apt-get install -y python3-certbot-nginx
+sudo certbot
+> Enter email address (used for urgent renewal and security notices) > support@gradido.net
+> Please read the Terms of Service at > Y
+> Would you be willing, once your first certificate is successfully issued, to > N
+> No names were found in your configuration files. Please enter in your domain > stage1.gradido.net
+
+# Install logrotate
+# sudo apt-get install -y logrotate
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $SCRIPT_DIR/logrotate/gradido.conf.template > $SCRIPT_DIR/logrotate/gradido.conf
+sudo mv $SCRIPT_DIR/logrotate/gradido.conf /etc/logrotate.d/gradido.conf
+sudo chown root:root /etc/logrotate.d/gradido.conf
+
+# Install mysql autobackup
+sudo apt-get install -y automysqlbackup
+
+# Webhooks (optional) (for development)
+sudo apt install -y webhook
+# TODO generate
+# put hook into github
+# TODO adjust secret
+# TODO adjust branch if needed
+# https://stage1.gradido.net/hooks/github
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $SCRIPT_DIR/webhook/hooks.json.template > ~/hooks.json
+
+webhook -hooks ~/hooks.json &
+# or for debugging
+# webhook -hooks ~/hooks.json -verbose
+
+# create db user
+export DB_USER=gradido
+export DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo);
+sudo mysql <<EOFMYSQL
+    CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASSWORD';
+    GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'localhost';
+    FLUSH PRIVILEGES;
+EOFMYSQL
+
+# Configure database
+# TODO - do this in the start.sh to regenerate configs on each deploy
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/database/.env.template > $PROJECT_ROOT/database/.env
+
+# Configure backend
+export JWT_SECRET=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo);
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/backend/.env.template > $PROJECT_ROOT/backend/.env
+
+# Configure frontend
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/frontend/.env.template > $PROJECT_ROOT/frontend/.env
+
+# Configure admin
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/admin/.env.template > $PROJECT_ROOT/admin/.env
+
+# Start gradido
+# Note: on first startup some errors will occur - nothing serious
+./start.sh
\ No newline at end of file
diff --git a/deployment/bare_metal/log/.gitkeep b/deployment/bare_metal/log/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/deployment/bare_metal/logrotate/gradido.conf.template b/deployment/bare_metal/logrotate/gradido.conf.template
new file mode 100644
index 000000000..c038f8e75
--- /dev/null
+++ b/deployment/bare_metal/logrotate/gradido.conf.template
@@ -0,0 +1,7 @@
+$GRADIDO_LOG_PATH/* {
+    weekly
+    rotate 26
+    size 10M
+    compress
+    delaycompress
+}
\ No newline at end of file
diff --git a/deployment/bare_metal/maintenance.sh b/deployment/bare_metal/maintenance.sh
new file mode 100755
index 000000000..4a268d270
--- /dev/null
+++ b/deployment/bare_metal/maintenance.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# update system
+sudo apt-get update
+sudo apt-get upgrade
+
+# update pm2
+sudo yarn global add pm2
+pm2 update
\ No newline at end of file
diff --git a/deployment/bare_metal/nginx/common/protect.conf b/deployment/bare_metal/nginx/common/protect.conf
new file mode 100644
index 000000000..6ad33bd8e
--- /dev/null
+++ b/deployment/bare_metal/nginx/common/protect.conf
@@ -0,0 +1,54 @@
+# Deny access to readme.(txt|html) or license.(txt|html) or example.(txt|html) and other common git related files
+location ~*  "/(^$|readme|license|example|README|LEGALNOTICE|INSTALLATION|CHANGELOG)\.(txt|html|md)" {
+    deny all;
+}
+# Deny access to backup extensions & log files
+location ~* "\.(old|orig|original|php#|php~|php_bak|save|swo|aspx?|tpl|sh|bash|bak?|cfg|cgi|dll|exe|git|hg|ini|jsp|log|mdb|out|sql|svn|swp|tar|rdf)$" {
+    deny all;
+}
+# deny access to hidden files and directories
+location ~ /\.(?!well-known\/) {
+    deny all;
+}
+# deny access to base64 encoded urls
+location ~* "(base64_encode)(.*)(\()" {
+    deny all;
+}
+# deny access to url with the javascript eval() function
+location ~* "(eval\()" {
+    deny all;
+}
+# deny access to url which include \"127.0.0.1\"
+location ~* "(127\.0\.0\.1)" {
+    deny all;
+}
+location ~* "(GLOBALS|REQUEST)(=|\[|%)" {
+    deny all;
+}
+location ~* "(<|%3C).*script.*(>|%3)" {
+    deny all;
+}
+location ~ "(\\|\.\.\.|\.\./|~|`|<|>|\|)" {
+    deny all;
+}
+location ~* "(\'|\")(.*)(drop|insert|md5|select|union)" {
+    deny all;
+}
+location ~* "(https?|ftp|php):/" {
+    deny all;
+}
+location ~* "(=\\\'|=\\%27|/\\\'/?)\." {
+    deny all;
+}
+location ~ "(\{0\}|\(/\(|\.\.\.|\+\+\+|\\\"\\\")" {
+    deny all;
+}
+location ~ "(~|`|<|>|:|;|%|\\|\s|\{|\}|\[|\]|\|)" {
+    deny all;
+}
+location ~* "(&pws=0|_vti_|\(null\)|\{\$itemURL\}|echo(.*)kae|boot\.ini|etc/passwd|eval\(|self/environ|(wp-)?config\.|cgi-|muieblack)" {
+    deny all;
+}
+location ~* "/(^$|mobiquo|phpinfo|shell|sqlpatch|thumb|thumb_editor|thumbopen|timthumb|webshell|config|configuration)\.php" {
+    deny all;
+}
\ No newline at end of file
diff --git a/deployment/bare_metal/nginx/common/protect_add_header.conf b/deployment/bare_metal/nginx/common/protect_add_header.conf
new file mode 100644
index 000000000..998f10696
--- /dev/null
+++ b/deployment/bare_metal/nginx/common/protect_add_header.conf
@@ -0,0 +1,9 @@
+# Prevent browsers from incorrectly detecting non-scripts as scripts
+# https://infosec.mozilla.org/guidelines/web_security#x-content-type-options
+add_header X-Content-Type-Options "nosniff";
+
+# prevent clickjacking: https://www.owasp.org/index.php/Clickjacking
+# https://geekflare.com/add-x-frame-options-nginx/
+# https://infosec.mozilla.org/guidelines/web_security#x-frame-options
+add_header Content-Security-Policy "frame-ancestors 'none'";
+add_header X-Frame-Options "DENY";
\ No newline at end of file
diff --git a/deployment/bare_metal/nginx/conf.d/logging.conf b/deployment/bare_metal/nginx/conf.d/logging.conf
new file mode 100644
index 000000000..a76e8fae7
--- /dev/null
+++ b/deployment/bare_metal/nginx/conf.d/logging.conf
@@ -0,0 +1,4 @@
+log_format gradido_log '$remote_addr - $remote_user [$time_local] '
+ '"$request_method $status $request_uri"'
+ ' "$http_referer" "$http_user_agent"'
+ ' $server_protocol $body_bytes_sent $request_time';
\ No newline at end of file
diff --git a/deployment/bare_metal/nginx/sites-available/gradido b/deployment/bare_metal/nginx/sites-available/gradido
deleted file mode 100644
index c32d82483..000000000
--- a/deployment/bare_metal/nginx/sites-available/gradido
+++ /dev/null
@@ -1,73 +0,0 @@
-server {
-        server_name _;
-        listen 80;
-        listen [::]:80;
-
-        include /etc/nginx/common/protect.conf;
-        include /etc/nginx/common/protect_add_header.conf;
-
-        root /var/www/html/gradido/community_server/webroot;
-        index index.php;
-
-        gzip_static  on;
-
-
-        location ~ \.php$ {
-          include snippets/fastcgi-php.conf;
-          fastcgi_pass unix:/run/php/php7.4-fpm.sock;
-        }
-
-        location ~ /\.ht {
-          deny  all;
-        }
-
-        location /vue {
-          alias /var/www/html/gradido/frontend/dist;
-          index index.html;
-
-          location ~* \.(png)$ {
-            expires 39d;
-          }
-          try_files $uri $uri/ /index.html = 404;
-        }
-
-        location /account {
-                        proxy_http_version 1.1;
-                        proxy_set_header    Upgrade $http_upgrade;
-                        proxy_set_header    Connection 'upgrade';
-                        proxy_cache_bypass  $http_upgrade;
-                        proxy_set_header    X-Real-IP  $remote_addr;
-                        proxy_set_header    X-Forwarded-For $remote_addr;
-                        proxy_set_header    Host $host;
-                        rewrite  /account/(.*) /$1 break;
-
-                        proxy_pass          http://127.0.0.1:1200;
-                        proxy_redirect      off;
-
-
-        }
-
-        location /login_api {
-                        proxy_http_version 1.1;
-                        proxy_set_header    Upgrade $http_upgrade;
-                        proxy_set_header    Connection 'upgrade';
-                        proxy_cache_bypass  $http_upgrade;
-                        proxy_set_header    X-Real-IP  $remote_addr;
-                        proxy_set_header    X-Forwarded-For $remote_addr;
-                        proxy_set_header    Host $host;
-                        rewrite  /login_api/(.*) /$1 break;
-
-                        proxy_pass          http://127.0.0.1:1201;
-                        proxy_redirect      off;
-
-
-        }
-
-
-        location / {
-            try_files $uri $uri/ /index.php?$args;
-        }
-
-        access_log /var/log/nginx/access.log main;
-
-}
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
new file mode 100644
index 000000000..aade0429b
--- /dev/null
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.ssl.template
@@ -0,0 +1,125 @@
+server {
+    if ($host = $NGINX_SERVER_NAME) {
+        return 301 https://$host$request_uri;
+    }
+
+    server_name $NGINX_SERVER_NAME;
+    listen 80;
+    listen [::]:80;
+    return 404;
+}
+
+server {
+    server_name $NGINX_SERVER_NAME;
+
+    listen [::]:443 ssl ipv6only=on;
+    listen 443 ssl;
+    ssl_certificate $NGINX_SSL_CERTIFICATE;
+    ssl_certificate_key $NGINX_SSL_CERTIFICATE_KEY;
+    include $NGINX_SSL_INCLUDE;
+    ssl_dhparam $NGINX_SSL_DHPARAM;
+
+    include /etc/nginx/common/protect.conf;
+    include /etc/nginx/common/protect_add_header.conf;
+
+    #gzip_static  on;
+    gzip on;
+    gzip_proxied any;
+    gzip_types
+        text/css
+        text/javascript
+        text/xml
+        text/plain
+        application/javascript
+        application/x-javascript
+        application/json;
+
+    # Legacy URLS
+    set $REWRITE_LEGACY_URLS "$NGINX_REWRITE_LEGACY_URLS";
+    if ($REWRITE_LEGACY_URLS = 'true') {
+        rewrite ^/vue/?(.*)$ /$1 permanent;
+    }
+
+    # Frontend (default)
+    location / {
+		proxy_http_version 1.1;
+		proxy_set_header   Upgrade $http_upgrade;
+		proxy_set_header   Connection 'upgrade';
+		proxy_set_header   X-Forwarded-For $remote_addr;
+		proxy_set_header   X-Real-IP  $remote_addr;
+		proxy_set_header   Host $host;
+		
+		proxy_pass         http://127.0.0.1:3000;
+		proxy_redirect     off;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
+	}
+
+    # Backend
+    location /graphql {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://127.0.0.1:4000;
+        proxy_redirect     off;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.backend.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.backend.log warn;
+    }
+
+    # Backend webhooks
+    location /hook {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://127.0.0.1:4000/hook;
+        proxy_redirect     off;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.backend.hook.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.backend.hook.log warn;
+    }
+
+    # Webhook reverse proxy
+    location /hooks/ {
+        proxy_pass http://127.0.0.1:9000/hooks/;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.hooks.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.hooks.log warn;
+    }
+
+    # Admin Frontend
+    location /admin {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://127.0.0.1:8080/;
+        proxy_redirect     off;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.admin.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;
+    }
+    
+    # TODO this could be a performance optimization
+    #location /vue {
+    #    alias /var/www/html/gradido/frontend/dist;
+    #    index index.html;
+    #
+    #    location ~* \.(png)$ {
+    #        expires 39d;
+    #    }
+    #    try_files $uri $uri/ /index.html = 404;
+    #}
+}
\ No newline at end of file
diff --git a/deployment/bare_metal/nginx/sites-available/gradido.conf.template b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
new file mode 100644
index 000000000..b4c7b3463
--- /dev/null
+++ b/deployment/bare_metal/nginx/sites-available/gradido.conf.template
@@ -0,0 +1,111 @@
+server {
+    server_name $NGINX_SERVER_NAME;
+
+    listen 80;
+    listen [::]:80;
+
+    include /etc/nginx/common/protect.conf;
+    include /etc/nginx/common/protect_add_header.conf;
+
+    #gzip_static  on;
+    gzip on;
+    gzip_proxied any;
+    gzip_types
+        text/css
+        text/javascript
+        text/xml
+        text/plain
+        application/javascript
+        application/x-javascript
+        application/json;
+
+    # Legacy URLS
+    set $REWRITE_LEGACY_URLS "$NGINX_REWRITE_LEGACY_URLS";
+    if ($REWRITE_LEGACY_URLS = 'true') {
+        rewrite ^/vue/?(.*)$ /$1 permanent;
+    }
+
+    # Frontend (default)
+    location / {
+		proxy_http_version 1.1;
+		proxy_set_header   Upgrade $http_upgrade;
+		proxy_set_header   Connection 'upgrade';
+		proxy_set_header   X-Forwarded-For $remote_addr;
+		proxy_set_header   X-Real-IP  $remote_addr;
+		proxy_set_header   Host $host;
+		
+		proxy_pass         http://127.0.0.1:3000;
+		proxy_redirect     off;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.frontend.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.frontend.log warn;
+	}
+
+    # Backend
+    location /graphql {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://127.0.0.1:4000;
+        proxy_redirect     off;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.backend.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.backend.log warn;
+    }
+
+    # Backend webhooks
+    location /hook {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        # no trailing slash to keep the hook/ prefix
+        proxy_pass         http://127.0.0.1:4000/hook;
+        proxy_redirect     off;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.backend.hook.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.backend.hook.log warn;
+    }
+
+    # Webhook reverse proxy
+    location /hooks/ {
+        proxy_pass http://127.0.0.1:9000/hooks/;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.hooks.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.hooks.log warn;
+    }
+
+    # Admin Frontend
+    location /admin {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://127.0.0.1:8080/;
+        proxy_redirect     off;
+
+        access_log $GRADIDO_LOG_PATH/nginx-access.admin.log gradido_log;
+        error_log $GRADIDO_LOG_PATH/nginx-error.admin.log warn;
+    }
+
+    # TODO this could be a performance optimization
+    #location /vue {
+    #    alias /var/www/html/gradido/frontend/dist;
+    #    index index.html;
+    #
+    #    location ~* \.(png)$ {
+    #        expires 39d;
+    #    }
+    #    try_files $uri $uri/ /index.html = 404;
+    #}
+}
\ No newline at end of file
diff --git a/deployment/bare_metal/nginx/sites-available/gradido_updating b/deployment/bare_metal/nginx/sites-available/gradido_updating
deleted file mode 100644
index df07e3715..000000000
--- a/deployment/bare_metal/nginx/sites-available/gradido_updating
+++ /dev/null
@@ -1,29 +0,0 @@
-
-server {
-        server_name _;
-        listen 80;
-        listen [::]:80;
-
-        include /etc/nginx/common/protect.conf;
-        include /etc/nginx/common/protect_add_header.conf;
-
-        root /var/www/html/;
-        index updating.html;
-
-        location /account {
-           alias /var/www/html/;
-           index updating.html; 
-        }
-        location /vue {
-           alias /var/www/html/;
-           index updating.html;
-        }
-
-        location ~ /\.ht {
-          deny  all;
-        }
-
-        access_log /var/log/nginx/access.log main;
-
-}
-
diff --git a/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template b/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template
new file mode 100644
index 000000000..ddcb9ffc1
--- /dev/null
+++ b/deployment/bare_metal/nginx/sites-available/update-page.conf.ssl.template
@@ -0,0 +1,37 @@
+
+server {
+    if ($host = $NGINX_SERVER_NAME) {
+        return 301 https://$host$request_uri;
+    }
+
+    server_name $NGINX_SERVER_NAME;
+    listen 80;
+    listen [::]:80;
+    return 404;
+}
+server {
+    server_name $NGINX_SERVER_NAME;
+
+    listen [::]:443 ssl ipv6only=on;
+    listen 443 ssl;
+    ssl_certificate $NGINX_SSL_CERTIFICATE;
+    ssl_certificate_key $NGINX_SSL_CERTIFICATE_KEY;
+    include $NGINX_SSL_INCLUDE;
+    ssl_dhparam $NGINX_SSL_DHPARAM;
+
+    include /etc/nginx/common/protect.conf;
+    include /etc/nginx/common/protect_add_header.conf;
+
+    gzip on;
+
+    root $NGINX_UPDATE_PAGE_ROOT;
+    index updating.html;
+
+    location / {
+        try_files /updating.html =404;
+    }
+
+    access_log $GRADIDO_LOG_PATH/nginx-access.update-page.log gradido_log;
+    error_log $GRADIDO_LOG_PATH/nginx-error.update-page.log warn;
+}
+
diff --git a/deployment/bare_metal/nginx/sites-available/update-page.conf.template b/deployment/bare_metal/nginx/sites-available/update-page.conf.template
new file mode 100644
index 000000000..c26a705ce
--- /dev/null
+++ b/deployment/bare_metal/nginx/sites-available/update-page.conf.template
@@ -0,0 +1,22 @@
+
+server {
+    server_name _;
+    listen 80;
+    listen [::]:80;
+
+    include /etc/nginx/common/protect.conf;
+    include /etc/nginx/common/protect_add_header.conf;
+
+    gzip on;
+
+    root $NGINX_UPDATE_PAGE_ROOT;
+    index updating.html;
+
+    location / {
+      try_files /updating.html =404;
+    }
+
+    access_log $GRADIDO_LOG_PATH/nginx-access.update-page.log gradido_log;
+    error_log $GRADIDO_LOG_PATH/nginx-error.update-page.log warn;
+}
+
diff --git a/deployment/bare_metal/nginx/update-page/updating.html.template b/deployment/bare_metal/nginx/update-page/updating.html.template
new file mode 100644
index 000000000..a88a40b0f
--- /dev/null
+++ b/deployment/bare_metal/nginx/update-page/updating.html.template
@@ -0,0 +1,3 @@
+Gradido is currently updating...<br>
+please stand by and try again in some minutes<br>
+<br>
\ No newline at end of file
diff --git a/deployment/bare_metal/nginx/updating_original.html b/deployment/bare_metal/nginx/updating_original.html
deleted file mode 100644
index 8975e3970..000000000
--- a/deployment/bare_metal/nginx/updating_original.html
+++ /dev/null
@@ -1 +0,0 @@
-Gradido Servers are updating..., please stand by and try again in some minutes
diff --git a/deployment/bare_metal/build_frontend.sh b/deployment/bare_metal/old/build_frontend.sh
similarity index 100%
rename from deployment/bare_metal/build_frontend.sh
rename to deployment/bare_metal/old/build_frontend.sh
diff --git a/deployment/bare_metal/old/setup_server_online_ubuntu18.sh b/deployment/bare_metal/old/setup_server_online_ubuntu18.sh
new file mode 100644
index 000000000..7cc267e33
--- /dev/null
+++ b/deployment/bare_metal/old/setup_server_online_ubuntu18.sh
@@ -0,0 +1,70 @@
+# phpmyadmin
+echo "install and secure phpmyadmin"
+sudo apt install phpmyadmin
+cd /etc/phpmyadmin/conf.d
+sudo cat <<EOF > pma_secure.php
+<?php
+
+# PhpMyAdmin Settings
+# This should be set to a random string of at least 32 chars
+$cfg['blowfish_secret'] = '3!#32@3sa(+=_4?),5XP_:U%%8\34sdfSdg43yH#{o';
+
+$i=0;
+$i++;
+
+$cfg['Servers'][$i]['auth_type'] = 'cookie';
+$cfg['Servers'][$i]['AllowNoPassword'] = false;
+$cfg['Servers'][$i]['AllowRoot'] = false;
+
+?>
+EOF
+phpmyadminPwd = $(openssl passwd)
+echo "Please give a username for phpmyadmin, but not root"
+read phpmyadmin_user
+# TODO: check if phpmyadmin_user isn't really root
+sudo cat <<EOF > /etc/nginx/pma_pass 
+$phpmyadmin_user:$phpmyadminPwd
+EOF
+
+serverIP = $(ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1')
+
+sudo cat <<EOF > /etc/nginx/sites-available/phpmyadmin 
+
+server {
+        listen 80 ;
+
+        listen [::]:80;
+        server_name $serverIP;
+
+
+        location ~* \.(png|jpg|ico)$ {
+          expires 30d;
+        }
+
+        location ~* \.(js|css) {
+          expires 30d;
+        }
+		
+		location /phpmyadmin {
+			root /usr/share/phpmyadmin
+			index index.php;
+			
+			location ~ \.php$ {
+			  include snippets/fastcgi-php.conf;
+			  fastcgi_pass unix:/run/php/php7.4-fpm.sock;
+			}
+			
+			location / {
+                try_files $uri $uri/ /index.php?$args;
+			}
+		}
+
+        location ~ /\.ht {
+          deny  all;
+        }
+
+        access_log /var/log/nginx/access.log main;
+}
+
+EOF
+sudo ln -s /etc/nginx/sites-available/phpmyadmin /etc/nginx/sites-enabled 
\ No newline at end of file
diff --git a/deployment/bare_metal/restore.sh b/deployment/bare_metal/restore.sh
new file mode 100755
index 000000000..61baeb231
--- /dev/null
+++ b/deployment/bare_metal/restore.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# This script will shut down all services, replace the whole database with the selected backup and restart the services
+
+# Find current directory & configure paths
+set -o allexport
+SCRIPT_PATH=$(realpath $0)
+SCRIPT_DIR=$(dirname $SCRIPT_PATH)
+PROJECT_ROOT=$SCRIPT_DIR/../..
+set +o allexport
+
+# Parameter is a proper file?
+export BACKUP_FILE=${SCRIPT_DIR}/backup/$1 
+if [ ! -f "$BACKUP_FILE" ]; then
+    return "File '$BACKUP_FILE' does not exist" 2>/dev/null || exit 1
+fi
+
+# Load backend .env for DB_USERNAME, DB_PASSWORD & DB_DATABASE
+# NOTE: all config values will be in process.env when starting
+# the services and will therefore take precedence over the .env
+if [ -f "$PROJECT_ROOT/backend/.env" ]; then
+    export $(cat $PROJECT_ROOT/backend/.env | sed 's/#.*//g' | xargs)
+else
+    export $(cat $PROJECT_ROOT/backend/.env.dist | sed 's/#.*//g' | xargs)
+fi
+
+# Stop gradido-backend service
+pm2 stop gradido-backend
+
+# Backup data
+mysqldump --databases --single-transaction --quick --lock-tables=false > ${SCRIPT_DIR}/backup/mariadb-restore-backup-$(date +%d-%m-%Y_%H-%M-%S).sql -u ${DB_USER} -p${DB_PASSWORD} ${DB_DATABASE}
+
+# Restore Data
+mysql -u ${DB_USER} -p${DB_PASSWORD} <<EOFMYSQL
+    source $BACKUP_FILE
+EOFMYSQL
+
+# Update database if needed (use dev_up for seeding setups)
+yarn --cwd $PROJECT_ROOT/database up
+
+# Start gradido-backend service
+pm2 start gradido-backend
\ No newline at end of file
diff --git a/deployment/bare_metal/setup.md b/deployment/bare_metal/setup.md
new file mode 100644
index 000000000..832d34fa4
--- /dev/null
+++ b/deployment/bare_metal/setup.md
@@ -0,0 +1,87 @@
+# Setup script to setup the server be ready to run gradido
+# This assums you have root access via ssh to your cleanly setup server
+# Furthermore this assumes you have debian (11 64bit) running
+
+> ssh root@gddhost.tld
+
+# change root default shell
+> chsh -s /bin/bash
+# Create user `gradido`
+> useradd -d /home/gradido -m gradido
+> passwd gradido
+>> enter new password twice
+
+# Gives the user priviledges - this might be omitted in order to harden security
+# Care: This will require another administering user if you don't want root access.
+#       Since this setup expects the user running the software be the same as the administering user,
+#       you have to adjust the instructions according to that scenario.
+#       You might lock yourself out, if done wrong.
+> usermod -a -G sudo gradido
+
+# change gradido default shell
+> chsh -s /bin/bash gradido
+# Install sudo
+> apt-get install sudo
+# switch to the new user
+> su gradido
+
+# Register first ssh key for user `gradido`
+> mkdir ~/.ssh
+> chmod 700 ~/.ssh
+> nano ~/.ssh/authorized_keys
+>> insert public key
+>> ctrl + x
+>> save
+
+# Test authentication via SSH
+> ssh -i /path/to/privKey gradido@gddhost.tld
+>> This should log you in and allow you to use sudo commands, which will require the user's password
+
+# Disable password authentication & root login
+> cd /etc/ssh
+> sudo cp sshd_config sshd_config.org
+> sudo nano sshd_config
+>> change `PermitRootLogin yes` to `PermitRootLogin no`
+>> change `#PasswordAuthentication yes` to `PasswordAuthentication no`
+>> change `UsePAM yes` to `UsePAM no`
+>> ctrl + x
+>> save
+> sudo /etc/init.d/ssh restart
+
+# Test SSH Access only, no root ssh access
+> ssh gradido@gddhost.tld
+>> Will result in in either a password request for your key or the message `Permission denied (publickey)`
+> ssh -i /path/to/privKey root@gddhost.tld
+>> Will result in `Permission denied (publickey)`
+> ssh -i /path/to/privKey gradido@gddhost.tld
+>> Will succeed after entering the correct keys password (if any)
+
+# update system
+> sudo apt-get update
+> sudo apt-get upgrade
+
+# Install security tools
+## ufw
+> sudo apt-get install ufw
+> sudo ufw allow http
+> sudo ufw allow https
+> sudo ufw allow ssh
+> sudo ufw enable
+
+## fail2ban
+> sudo apt-get install -y fail2ban
+> sudo /etc/init.d/fail2ban restart
+
+# Install gradido
+> sudo apt-get install git
+> git clone https://github.com/gradido/gradido.git
+> cd gradido/deployment/bare_metal
+
+# Adjust .env
+# NOTE ';' can not be part of any value
+> cd gradido/deployment/bare_metal
+> cp .env.dist .env
+> nano .env
+>> Adjust values accordingly
+# TODO the install.sh is not yet ready to run directly - consider to use it as pattern to do it manually
+> ./install.sh
\ No newline at end of file
diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh
new file mode 100755
index 000000000..3d0589569
--- /dev/null
+++ b/deployment/bare_metal/start.sh
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+# Find current directory & configure paths
+set -o allexport
+SCRIPT_PATH=$(realpath $0)
+SCRIPT_DIR=$(dirname $SCRIPT_PATH)
+LOCK_FILE=$SCRIPT_DIR/update.lock
+UPDATE_HTML=$SCRIPT_DIR/nginx/update-page/updating.html
+PROJECT_ROOT=$SCRIPT_DIR/../..
+NGINX_CONFIG_DIR=$SCRIPT_DIR/nginx/sites-available
+set +o allexport
+
+# Load .env or .env.dist if not present
+# NOTE: all config values will be in process.env when starting
+# the services and will therefore take precedence over the .env
+if [ -f "$SCRIPT_DIR/.env" ]; then
+    export $(cat $SCRIPT_DIR/.env | sed 's/#.*//g' | xargs)
+else
+    export $(cat $SCRIPT_DIR/.env.dist | sed 's/#.*//g' | xargs)
+fi
+
+# lock start
+if [ -f $LOCK_FILE ] ; then
+  echo "Already building!"
+  exit 1
+fi
+touch $LOCK_FILE
+
+# Create a new updating.html from the template
+\cp $SCRIPT_DIR/nginx/update-page/updating.html.template $UPDATE_HTML
+
+# configure nginx for the update-page
+echo 'Configuring nginx to serve the update-page<br>' >> $UPDATE_HTML
+rm /etc/nginx/sites-enabled/gradido.conf
+ln -s /etc/nginx/sites-available/update-page.conf /etc/nginx/sites-enabled/
+sudo /etc/init.d/nginx restart
+
+# stop all services
+echo 'Stopping all Gradido services<br>' >> $UPDATE_HTML
+pm2 stop all
+
+# git
+BRANCH=${1:-master}
+echo "Starting with git pull - branch:$BRANCH<br>" >> $UPDATE_HTML
+cd $PROJECT_ROOT
+git fetch origin $BRANCH
+git checkout $BRANCH
+git pull
+export BUILD_COMMIT="$(git rev-parse HEAD)"
+
+# Generate gradido.conf from template
+echo 'Generate new gradido nginx config<br>' >> $UPDATE_HTML
+case "$NGINX_SSL" in
+ true) TEMPLATE_FILE="gradido.conf.ssl.template" ;;
+    *) TEMPLATE_FILE="gradido.conf.template" ;;
+esac
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/gradido.conf
+
+# Generate update-page.conf from template
+echo 'Generate new update-page nginx config<br>' >> $UPDATE_HTML
+case "$NGINX_SSL" in
+ true) TEMPLATE_FILE="update-page.conf.ssl.template" ;;
+    *) TEMPLATE_FILE="update-page.conf.template" ;;
+esac
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $NGINX_CONFIG_DIR/$TEMPLATE_FILE > $NGINX_CONFIG_DIR/update-page.conf
+
+# Install & build database
+echo 'Updating database<br>' >> $UPDATE_HTML
+cd $PROJECT_ROOT/database
+yarn install
+yarn build
+if [ "$DEPLOY_SEED_DATA" = "true" ]; then
+  yarn dev_up
+  yarn dev_reset
+  yarn seed 
+else
+  yarn up
+fi
+
+# Install & build backend
+echo 'Updating backend<br>' >> $UPDATE_HTML
+cd $PROJECT_ROOT/backend
+# TODO maybe handle this differently?
+unset NODE_ENV
+yarn install
+yarn build
+# TODO maybe handle this differently?
+export NODE_ENV=production
+pm2 delete gradido-backend
+pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.log --log-date-format 'DD-MM HH:mm:ss.SSS'
+pm2 save
+
+# Install & build frontend
+echo 'Updating frontend<br>' >> $UPDATE_HTML
+cd $PROJECT_ROOT/frontend
+# TODO maybe handle this differently?
+unset NODE_ENV
+yarn install
+yarn build
+# TODO maybe handle this differently?
+export NODE_ENV=production
+pm2 delete gradido-frontend
+pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.log --log-date-format 'DD-MM HH:mm:ss.SSS'
+pm2 save
+
+# Install & build admin
+echo 'Updating admin<br>' >> $UPDATE_HTML
+cd $PROJECT_ROOT/admin
+# TODO maybe handle this differently?
+unset NODE_ENV
+yarn install
+yarn build
+# TODO maybe handle this differently?
+export NODE_ENV=production
+pm2 delete gradido-admin
+pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.log --log-date-format 'DD-MM HH:mm:ss.SSS'
+pm2 save
+
+# let nginx showing gradido
+echo 'Configuring nginx to serve gradido again<br>' >> $UPDATE_HTML
+ln -s /etc/nginx/sites-available/gradido.conf /etc/nginx/sites-enabled/
+rm /etc/nginx/sites-enabled/update-page.conf
+sudo /etc/init.d/nginx restart
+
+# release lock
+rm $LOCK_FILE
\ No newline at end of file
diff --git a/deployment/bare_metal/update_all.sh b/deployment/bare_metal/update_all.sh
deleted file mode 100755
index e045d3f39..000000000
--- a/deployment/bare_metal/update_all.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-EMPTY_UPDATE_HTML=/var/www/html/updating_original.html
-UPDATE_HTML=/var/www/html/updating.html
-LOCK_FILE=/root/relay.lock
-PROJECT_PATH=/var/www/html/gradido
-SITE_CONFIG=stage1
-UPDATE_SITE_CONFIG=stage1_updating
-
-# this script can be called for example from webhookrelay.com relay 
-# to auto-deploy automatic after a update to the master branch
-
-if [ -f $LOCK_FILE ] ; then
-  retVal="Already building!"
-  return "${retVal}" 2>/dev/null || exit "${retVal}"
-fi
-
-touch $LOCK_FILE
-
-# start with nearly empty html
-# needed a nearly empty html page in the folder
-cp $EMPTY_UPDATE_HTML $UPDATE_HTML
-
-# let nginx showing a update page
-# needed nginx site-configs in nginx folders
-# gradido for running gradido servers
-# gradido_updating for showing upddate.html idealy for all pathes
-rm /etc/nginx/sites-enabled/$SITE_CONFIG
-ln -s /etc/nginx/sites-available/$UPDATE_SITE_CONFIG /etc/nginx/sites-enabled/
-service nginx restart
-
-# stop login server
-screen -XS login quit
-echo 'starting with git pull<br>' >> $UPDATE_HTML
-cd $PROJECT_PATH
-# git checkout -f master
-git pull
-cd deployment/bare_metal
-echo 'starting with rebuilding login-server<br>' >> $UPDATE_HTML
-./build_and_start_login_server.sh
-echo 'starting with rebuilding frontend<br>' >> $UPDATE_HTML
-./build_frontend.sh
-
-
-# let nginx showing gradido
-rm /etc/nginx/sites-enabled/$UPDATE_SITE_CONFIG
-ln -s /etc/nginx/sites-available/$SITE_CONFIG /etc/nginx/sites-enabled/
-service nginx restart
-
-rm $LOCK_FILE
-
diff --git a/deployment/bare_metal/webhook/hooks.json.template b/deployment/bare_metal/webhook/hooks.json.template
new file mode 100644
index 000000000..7f6a76fd5
--- /dev/null
+++ b/deployment/bare_metal/webhook/hooks.json.template
@@ -0,0 +1,37 @@
+[
+    {
+      "id": "github",
+      "execute-command": "/home/gradido/gradido/deployment/bare_metal/start.sh",
+      "pass-arguments-to-command": [
+        {
+          "source": "string",
+          "name": "$WEBHOOK_GITHUB_BRANCH"
+        }
+      ],
+      "command-working-directory": "/home/gradido/gradido/deployment/bare_metal",
+      "trigger-rule": {
+        "and": [
+          {
+            "match": {
+              "type": "payload-hash-sha1",
+              "secret": "$WEBHOOK_GITHUB_SECRET",
+              "parameter": {
+                "source": "header",
+                "name": "X-Hub-Signature"
+              }
+            }
+          },
+          {
+            "match": {
+              "type": "value",
+              "value": "refs/heads/$WEBHOOK_GITHUB_BRANCH",
+              "parameter": {
+                "source": "payload",
+                "name": "ref"
+              }
+            }
+          }
+        ]
+      }
+    }
+  ]
\ No newline at end of file
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index cdaf46a7a..64a38e244 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -129,10 +129,6 @@ services:
   ## NGINX ################################################
   #########################################################
   nginx:
-    depends_on:
-      - frontend 
-      - community-server
-      - login-server
     volumes: 
       - ./logs/nginx:/var/log/nginx 
   
diff --git a/docker-compose.yml b/docker-compose.yml
index ae72f3137..1d449fcea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -151,15 +151,14 @@ services:
   ## nginx, connect login-server and community-server together (and php-fpm to community-server)
   nginx:
     build: 
-      context: .
-      dockerfile: ./nginx/Dockerfile
+      context: ./nginx/
     networks:
       - external-net
       - internal-net
     depends_on:
-      - community-server
-      - login-server
-      - frontend 
+      - frontend
+      - backend
+      - admin 
     ports:
       - 80:80
   
diff --git a/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-01-LoginMaske.md b/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-01-LoginMaske.md
index eae90354f..d1a788a6b 100644
--- a/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-01-LoginMaske.md
+++ b/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-01-LoginMaske.md
@@ -28,8 +28,8 @@ Es wird die Anzeige der Login-Maske geprüft auf:
 
 Es wird die URL
 
-* Testumgebung: https://stage1.gradido.net/vue/login
-* Produktionsumgebung: https://gradido.net/vue/login
+* Testumgebung: https://stage1.gradido.net/login
+* Produktionsumgebung: https://gdd1.gradido.net/login
 
 aufgerufen und die Login-Maske wird angezeigt.
 
diff --git a/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-02-LoginMaske.md b/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-02-LoginMaske.md
index db14a3d1c..1d0a26c3e 100644
--- a/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-02-LoginMaske.md
+++ b/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-02-LoginMaske.md
@@ -31,8 +31,8 @@ Prüfung auf korrekten Funktionsweise des Buttons "Anmeldung":
 2. Mit Betätigen des Buttons "Anmeldung" wird der Login-Prozess gestartet
    1. *Gibt es noch weitere Prüfschritte (LOG-Ausgaben auf Login-, Community-Server o.ä.) die hier überprüft werden sollten?*
 3. Bei erfolgreichem Login wird die URL angezeigt
-   * Testumgebung: "https://stage1.gradido.net/vue/overview"
-   * Produktionsumgebung: "https://gradido.net/vue/overview"
+   * Testumgebung: "https://stage1.gradido.net/overview"
+   * Produktionsumgebung: "https://gdd1.gradido.net/overview"
 4. Bei fehlerhaftem Login wird eine entsprechend aussagekräftige Fehlermeldung angezeigt und die Anzeige verbleibt auf der Login-Maske.
 
 ## Ende-Bedingungen:
diff --git a/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-03-LoginMaske.md b/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-03-LoginMaske.md
index 3d9a373b2..5623aebdf 100644
--- a/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-03-LoginMaske.md
+++ b/docu/Concepts/Testfallkatalog/T02-Benutzerverwaltung/T02-C001-03-LoginMaske.md
@@ -21,8 +21,8 @@ Es wird in der Login-Maske die Funktion des Links "Passwort vergessen?"geprüft:
 
 Es wird die URL
 
-* Testumgebung: https://stage1.gradido.net/vue/login
-* Produktionsumgebung: https://gradido.net/vue/login
+* Testumgebung: https://stage1.gradido.net/login
+* Produktionsumgebung: https://gdd1.gradido.net/login
 
 aufgerufen und die Login-Maske wird angezeigt.
 
@@ -33,8 +33,8 @@ aufgerufen und die Login-Maske wird angezeigt.
 * Prüfung auf korrekte Funktionsweise des Links "Passwort vergessen?"
 * keine sonstigen Eingaben bzw. Vorraussetzungen notwendig
 * Mit Betätigen des Links "Passwort vergessen?" wird der Passwort-Zurücksetzen-Prozess gestartet und unter
-  * der Testumgebung: https://stage1.gradido.net/vue/password
-  * der Produktionsumgebung: https://gradido.net/vue/password
+  * der Testumgebung: https://stage1.gradido.net/password
+  * der Produktionsumgebung: https://gdd1.gradido.net/password
 * folgende Maske angezeigt:
 
 ![1te Passwort zurücksetzen Maske](../image/T02-C001-03-LoginMaske1.png)
@@ -70,8 +70,8 @@ aufgerufen und die Login-Maske wird angezeigt.
       3. Wiederholung von Schritt 2.4.1 und 2.4.2 bis alle verfügbaren Sprachen geprüft sind
    5. Link "Zurück" ist aktiv und landet auf URL
 
-      1. Testumgebung: https://stage1.gradido.net/vue/Login
-      2. Produktionsumgebung: https://gradido.net/vue/Login
+      1. Testumgebung: https://stage1.gradido.net/login
+      2. Produktionsumgebung: https://gdd1.gradido.net/login
    6. Footer-Links:
 
       1. "Gradido-Akademie" reagiert und landet je nach aktuell eingestellter Sprache auf URL "https://gradido.net/de"
@@ -91,8 +91,8 @@ aufgerufen und die Login-Maske wird angezeigt.
 ![Email-Versandmakse](../image/T02-C001-03-LoginMaske2.png)
 
 5. **In dem angegebenen Email-Postfach wird eine Email empfangen, die ein Zurücksetzen-Link enthält:**
-   1. Testumgebung: https://stage1.gradido.net/vue/reset/'erzeugter rest-code'
-   2. Produktionsumgebung: https://gradido.net/vue/reset/'erzeugter reset-code'
+   1. Testumgebung: https://stage1.gradido.net/reset/'erzeugter rest-code'
+   2. Produktionsumgebung: https://ggd1.gradido.net/reset/'erzeugter reset-code'
 6. **Mit Betätigen des Reset-Links bzw. Aufruf des Rest-Links im Browser wird folgende Maske angezeigt:**
 
 ![2te Passwort zurücksetzen Maske](../image/T02-C001-03-LoginMaske3.png)
@@ -137,8 +137,8 @@ aufgerufen und die Login-Maske wird angezeigt.
     3. Wiederholung von Schritt 8.3.1 und 8.3.2 bis alle verfügbaren Sprachen geprüft sind
 12. Link "Zurück" ist aktiv und landet auf URL
 
-    1. Testumgebung: https://stage1.gradido.net/vue/Login
-    2. Produktionsumgebung: https://gradido.net/vue/Login
+    1. Testumgebung: https://stage1.gradido.net/Login
+    2. Produktionsumgebung: https://gdd1.gradido.net/Login
 13. Footer-Links:
 
     1. "Gradido-Akademie" reagiert und landet je nach aktuell eingestellter Sprache auf URL "https://gradido.net/de"
diff --git a/docu/Templates/Templat-Overview-16-12-2021/Template-Overview-2021.pdf b/docu/Templates/Templat-Overview-16-12-2021/Template-Overview-2021.pdf
new file mode 100644
index 000000000..a2e8c10af
Binary files /dev/null and b/docu/Templates/Templat-Overview-16-12-2021/Template-Overview-2021.pdf differ
diff --git a/docu/create-coins-as-admin.md b/docu/create-coins-as-admin.md
index 6a95df119..f03da7733 100644
--- a/docu/create-coins-as-admin.md
+++ b/docu/create-coins-as-admin.md
@@ -1,5 +1,5 @@
 ### User creation
-A user needs to be created on the login_server we do this when we create a User in the client https://$community_domain/vue/register.
+A user needs to be created on the login_server we do this when we create a User in the client https://$community_domain/register.
 
 ### Admin user
 To set a User admin we need the following SQL query on the gradido_login database:
diff --git a/docu/onboarding_process.md b/docu/onboarding_process.md
new file mode 100644
index 000000000..8b748a33f
--- /dev/null
+++ b/docu/onboarding_process.md
@@ -0,0 +1,25 @@
+# Onboarding process
+## Meeting with Bernd (zoom)
+## Meeting with Claus-Peter and perhaps concerning team member (zoom)
+## Presentation to all team members (discord)
+## Grant access to
+- Nextcloud server
+- Add to github repository (create github account if not available)
+## Start working  
+- install docker desktop
+- install git: https://git-scm.com/book/de/v2/Erste-Schritte-Git-installieren
+- add new ssh key: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/adding-a-new-ssh-key-to-your-github-account
+- download gradido repository: git clone git@github.com:gradido/gradido.git --recursive
+- install visual studio code
+- docker-compose build
+- docker-compose up
+http://localhost/vue should be same as https://gdd1.gradido.com/vue
+
+## git basics to update this document
+- git status
+- git branch onboarding_process
+- git checkout onboarding_process
+- git add onboarding_process.md
+- git commit
+- git push
+- git push --set-upstream origin onboarding_process
diff --git a/frontend/.env.dist b/frontend/.env.dist
index 80dafb7f9..f7bda826a 100644
--- a/frontend/.env.dist
+++ b/frontend/.env.dist
@@ -1,4 +1,3 @@
-GRAPHQL_URI=http://localhost:4000/graphql
+GRAPHQL_URI=http://localhost/graphql
 DEFAULT_PUBLISHER_ID=2896
-#BUILD_COMMIT=0000000
-ADMIN_AUTH_URL=http://localhost/admin/authenticate?token=$1
\ No newline at end of file
+ADMIN_AUTH_URL=http://localhost/admin/authenticate?token={token}
\ No newline at end of file
diff --git a/frontend/.env.template b/frontend/.env.template
new file mode 100644
index 000000000..8c9c053cc
--- /dev/null
+++ b/frontend/.env.template
@@ -0,0 +1,3 @@
+GRAPHQL_URI=$GRAPHQL_URI
+DEFAULT_PUBLISHER_ID=2896
+ADMIN_AUTH_URL=$ADMIN_AUTH_URL
\ No newline at end of file
diff --git a/frontend/run/server.js b/frontend/run/server.js
index 8a3f54557..7d75acba8 100644
--- a/frontend/run/server.js
+++ b/frontend/run/server.js
@@ -1,15 +1,21 @@
 // Imports
 const express = require('express')
-const serveStatic = require('serve-static')
+const path = require('path')
 
-// Port
+// Host & Port
+const hostname = '127.0.0.1'
 const port = process.env.PORT || 3000
 
 // Express Server
 const app = express()
-// eslint-disable-next-line node/no-path-concat
-app.use(serveStatic(__dirname + '/../dist'))
-app.listen(port)
+// Serve files
+app.use(express.static(path.join(__dirname, '../dist')))
+// Default to index.html
+app.get('*', (req, res) => {
+  res.sendFile(path.join(__dirname, '../dist/index.html'))
+})
 
-// eslint-disable-next-line no-console
-console.log(`http://frontend:${port} server started.`)
+app.listen(port, hostname, () => {
+  // eslint-disable-next-line no-console
+  console.log('Listening at http://%s:%s/', hostname, port)
+})
diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue
index 0b8154293..4687f639f 100644
--- a/frontend/src/components/Menu/Navbar.vue
+++ b/frontend/src/components/Menu/Navbar.vue
@@ -38,14 +38,19 @@
           </b-link>
         </div>
         <b-nav-item to="/overview" class="mb-3">
+          <b-icon icon="house" aria-hidden="true"></b-icon>
           {{ $t('overview') }}
         </b-nav-item>
-        <b-nav-item to="/send" class="mb-3">{{ $t('send') }}</b-nav-item>
+        <b-nav-item to="/send" class="mb-3">
+          <b-icon icon="arrow-left-right" aria-hidden="true"></b-icon>
+          {{ $t('send') }}
+        </b-nav-item>
         <b-nav-item to="/transactions" class="mb-3">
+          <b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon>
           {{ $t('transactions') }}
         </b-nav-item>
         <b-nav-item to="/profile" class="mb-3">
-          <b-icon icon="gear-fill" aria-hidden="true"></b-icon>
+          <b-icon icon="gear" aria-hidden="true"></b-icon>
           {{ $t('site.navbar.my-profil') }}
         </b-nav-item>
         <br />
@@ -55,7 +60,7 @@
           <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
         </b-nav-item>
         <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
-          <b-icon icon="link45deg" aria-hidden="true"></b-icon>
+          <b-icon icon="shield-check" aria-hidden="true"></b-icon>
           {{ $t('admin_area') }}
         </b-nav-item>
         <b-nav-item class="mb-3" @click="$emit('logout')">
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index 70119c69e..18ee08dbf 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -4,11 +4,20 @@
       <p></p>
       <div class="mb-6">
         <b-nav vertical class="w-200">
-          <b-nav-item to="/overview" class="mb-3" active>{{ $t('overview') }}</b-nav-item>
-          <b-nav-item to="/send" class="mb-3">{{ $t('send') }}</b-nav-item>
-          <b-nav-item to="/transactions" class="mb-3">{{ $t('transactions') }}</b-nav-item>
+          <b-nav-item to="/overview" class="mb-3" active>
+            <b-icon icon="house" aria-hidden="true"></b-icon>
+            {{ $t('overview') }}
+          </b-nav-item>
+          <b-nav-item to="/send" class="mb-3">
+            <b-icon icon="arrow-left-right" aria-hidden="true"></b-icon>
+            {{ $t('send') }}
+          </b-nav-item>
+          <b-nav-item to="/transactions" class="mb-3">
+            <b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon>
+            {{ $t('transactions') }}
+          </b-nav-item>
           <b-nav-item to="/profile" class="mb-3">
-            <b-icon icon="gear-fill" aria-hidden="true"></b-icon>
+            <b-icon icon="gear" aria-hidden="true"></b-icon>
             {{ $t('site.navbar.my-profil') }}
           </b-nav-item>
         </b-nav>
@@ -20,7 +29,7 @@
             <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
           </b-nav-item>
           <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
-            <b-icon icon="link45deg" aria-hidden="true"></b-icon>
+            <b-icon icon="shield-check" aria-hidden="true"></b-icon>
             {{ $t('admin_area') }}
           </b-nav-item>
           <b-nav-item class="mb-3" @click="$emit('logout')">
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index b3a9366b7..7e213e1d9 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -19,8 +19,8 @@ const environment = {
 }
 
 const endpoints = {
-  GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000/graphql',
-  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token=$1',
+  GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost/graphql',
+  ADMIN_AUTH_URL: process.env.ADMIN_AUTH_URL || 'http://localhost/admin/authenticate?token={token}',
 }
 
 const options = {}
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index a3aeb14a2..1af76e4df 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -26,7 +26,7 @@
     "days": "Tage",
     "decay": "Vergänglichkeit",
     "decayStart": " - Startblock für Vergänglichkeit am: ",
-    "decay_introduced": "Die Vergänglichkeit wurde Eingeführt am ",
+    "decay_introduced": "Die Vergänglichkeit wurde eingeführt am ",
     "decay_since_last_transaction": "Vergänglichkeit seit der letzten Transaktion",
     "hours": "Stunden",
     "last_transaction": "Letzte Transaktion",
@@ -47,8 +47,8 @@
     "change-password": "Fehler beim Ändern des Passworts",
     "empty-transactionlist": "Es gab einen Fehler mit der Übermittlung der Anzahl deiner Transaktionen.",
     "error": "Fehler",
-    "no-account": "Leider konnten wir keinen Account finden mit diesen Daten!",
-    "no-email-verify": "Die Email wurde noch nicht bestätigt, bitte überprüfe deine Emails und klicke auf den Aktivierungslink!",
+    "no-account": "Leider konnten wir keinen Account mit diesen Daten finden.",
+    "no-email-verify": "Dein Konto wurde noch nicht bestätigt. Bitte überprüfe deine E-Mails und klicke auf den Aktivierungslink!",
     "no-transactionlist": "Es gab leider einen Fehler. Es wurden keine Transaktionen vom Server übermittelt",
     "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet."
   },
@@ -56,29 +56,29 @@
     "amount": "Betrag",
     "at": "am",
     "cancel": "Abbrechen",
-    "close": "schließen",
-    "current_balance": "aktueller Kontostand",
+    "close": "Schließen",
+    "current_balance": "Aktueller Kontostand",
     "date": "Datum",
     "description": "Beschreibung",
-    "edit": "bearbeiten",
+    "edit": "Bearbeiten",
     "email": "E-Mail",
     "firstname": "Vorname",
-    "from": "von",
+    "from": "Von",
     "lastname": "Nachname",
     "memo": "Nachricht",
     "message": "Nachricht",
-    "new_balance": "neuer Kontostand nach Bestätigung",
+    "new_balance": "Neuer Kontostand nach Bestätigung",
     "password": "Passwort",
     "passwordRepeat": "Passwort wiederholen",
-    "password_new": "neues Passwort",
-    "password_new_repeat": "neues Passwort wiederholen",
-    "password_old": "altes Passwort",
+    "password_new": "Neues Passwort",
+    "password_new_repeat": "Neues Passwort wiederholen",
+    "password_old": "Altes Passwort",
     "recipient": "Empfänger",
     "reset": "Zurücksetzen",
-    "save": "speichern",
+    "save": "Speichern",
     "scann_code": "<strong>QR Code Scanner</strong> - Scanne den QR Code deines Partners",
     "sender": "Absender",
-    "send_check": "Bestätige deine Zahlung. Prüfe bitte nochmal alle Daten!",
+    "send_check": "Bestätige deine Transaktion. Prüfe bitte nochmal alle Angaben!",
     "send_now": "Jetzt senden",
     "send_transaction_error": "Leider konnte die Transaktion nicht ausgeführt werden!",
     "send_transaction_success": "Deine Transaktion wurde erfolgreich ausgeführt",
@@ -90,39 +90,39 @@
     "validation": {
       "gddSendAmount": "Das Feld {_field_} muss eine Zahl zwischen {min} und {max} mit höchstens zwei Nachkommastellen sein",
       "is-not": "Du kannst dir selbst keine Gradidos überweisen",
-      "usernmae-regex": "Der Username muss mit einem Buchstaben beginnen auf den mindestens zwei alfanumerische Zeichen folgen müssen.",
+      "usernmae-regex": "Der Username muss mit einem Buchstaben beginnen, auf den mindestens zwei alpha-numerische Zeichen folgen müssen.",
       "usernmae-unique": "Der Username ist bereits vergeben."
     },
     "your_amount": "Dein Betrag"
   },
   "gdt": {
     "action": "Aktion",
-    "calculation": "Berechnung der Gradido Transform",
+    "calculation": "Berechnung der GradidoTransform",
     "contribution": "Beitrag",
     "conversion": "Umrechnung",
-    "conversion-gdt-euro": "Umrechnung Euro / Gradido Transform (GDT)",
+    "conversion-gdt-euro": "Umrechnung Euro / GradidoTransform (GDT)",
     "credit": "Gutschrift",
     "factor": "Faktor",
     "formula": "Berechnungsformel",
     "funding": "Zu den Förderbeiträgen",
-    "gdt-received": "Gradido Transform (GDT) erhalten",
-    "no-transactions": "Du hast noch keine Gradido Transform (GDT).",
+    "gdt-received": "GradidoTransform (GDT) erhalten",
+    "no-transactions": "Du hast noch keine GradidoTransform (GDT).",
     "publisher": "Dein geworbenes Mitglied hat einen Beitrag bezahlt",
     "raise": "Erhöhung",
-    "recruited-member": "Geworbenes Mitglied"
+    "recruited-member": "Eingeladenes Mitglied"
   },
   "imprint": "Impressum",
   "language": "Sprache",
   "login": "Anmeldung",
   "logout": "Abmelden",
   "members_area": "Mitgliederbereich",
-  "message": "hallo gradido !!",
+  "message": "hallo gradido!!",
   "overview": "Übersicht",
   "privacy_policy": "Datenschutzerklärung",
   "publisher": {
-    "infoNoRegister": "Dies ist für die Registrieung nicht nötig!",
-    "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte leer lassen.",
-    "publisherId": "PublisherID"
+    "infoNoRegister": "Dies ist für die Registrieung nicht nötig.",
+    "infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!",
+    "publisherId": "Publisher-Id"
   },
   "send": "Senden",
   "settings": {
@@ -143,7 +143,7 @@
       "change-success": "Dein Name wurde erfolgreich geändert."
     },
     "newsletter": {
-      "newsletter": "Newsletter",
+      "newsletter": "Informationen per E-Mail",
       "newsletterFalse": "Du erhältst keine Informationen per E-Mail.",
       "newsletterTrue": "Du erhältst Informationen per E-Mail."
     },
@@ -151,15 +151,15 @@
       "change-password": "Passwort ändern",
       "forgot_pwd": "Passwort vergessen?",
       "not-authenticated": "Leider konnten wir dich nicht authentifizieren. Bitte wende dich an den Support.",
-      "resend_subtitle": "Dein Aktivierungslink ist abgelaufen, Du kannst hier ein neuen anfordern.",
+      "resend_subtitle": "Dein Aktivierungslink ist abgelaufen. Du kannst hier ein neuen anfordern.",
       "reset": "Passwort zurücksetzen",
       "reset-password": {
-        "text": "Jetzt kannst du ein neues Passwort speichern, mit dem du dich zukünftig in der Gradido-App anmelden kannst."
+        "text": "Gib nun ein neues Passwort ein, mit dem du dich zukünftig in deinem Gradido-Konto anmelden willst."
       },
       "send_now": "Jetzt senden",
       "set": "Passwort festlegen",
       "set-password": {
-        "text": "Jetzt kannst du ein neues Passwort speichern, mit dem du dich zukünftig in der Gradido-App anmelden kannst."
+        "text": "Speichere nun dein neues Passwort, mit dem du dich zukünftig in deinem Gradido-Konto anmelden kannst."
       },
       "subtitle": "Wenn du dein Passwort vergessen hast, kannst du es hier zurücksetzen."
     }
@@ -167,13 +167,13 @@
   "signup": "Registrieren",
   "site": {
     "404": {
-      "back": "Zurück zur Übersicht!",
+      "back": "Zurück zur Übersicht",
       "ooops": "Ooops!",
-      "text": "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zum Erkunden"
+      "text": "Seite nicht gefunden. Aber keine Sorge, wir haben noch viele andere Seiten zu erkunden."
     },
     "checkEmail": {
-      "errorText": "Email konnte nicht verifiziert werden.",
-      "title": "Email wird verifiziert"
+      "errorText": "E-Mail konnte nicht verifiziert werden.",
+      "title": "E-Mail wird verifiziert"
     },
     "login": {
       "community": "Tausend Dank, weil du bei uns bist!",
@@ -190,17 +190,17 @@
       "lowercase": "Ein Kleinbuchstabe erforderlich.",
       "minimum": "Mindestens 8 Zeichen.",
       "no-whitespace": "Keine Leerzeichen und Tabulatoren",
-      "one_number": "Eine Zahl erforderlich.",
-      "special-char": "Ein Sonderzeichen erforderlich (z.B. _ oder ä)",
+      "one_number": "Zahl erforderlich.",
+      "special-char": "Sonderzeichen erforderlich (z.B. _ oder ä)",
       "subtitle": "Werde Teil der Gemeinschaft!",
       "title": "Erstelle dein Gradido-Konto",
-      "uppercase": "Ein Großbuchstabe erforderlich."
+      "uppercase": "Großbuchstabe erforderlich."
     },
     "thx": {
-      "activateEmail": "Deine Email wurde noch nicht aktiviert, bitte überprüfe deine Email und Klicke den Aktivierungslink!",
-      "checkEmail": "Deine Email würde erfolgreich verifiziert.",
-      "email": "Wir haben dir eine eMail gesendet.",
-      "emailActivated": "Danke dass Du deine Email bestätigt hast.",
+      "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink!",
+      "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert.",
+      "email": "Wir haben dir eine E-Mail gesendet.",
+      "emailActivated": "Danke dass Du deine E-Mail bestätigt hast.",
       "errorTitle": "Achtung!",
       "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.",
       "reset": "Dein Passwort wurde geändert.",
@@ -209,7 +209,7 @@
   },
   "transaction": {
     "gdd-text": "Gradido Transaktionen",
-    "gdt-text": "Gradido Transform Transaktionen",
+    "gdt-text": "GradidoTransform Transaktionen",
     "more": "mehr",
     "nullTransactions": "Du hast noch keine Transaktionen auf deinem Konto.",
     "receiverNotFound": "Empfänger nicht gefunden",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5ccdfc63b..71ce6f9ef 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -1,5 +1,5 @@
 {
-  "admin_area": "Admin's area",
+  "admin_area": "Admin Area",
   "back": "Back",
   "community": {
     "choose-another-community": "Choose another community",
@@ -9,7 +9,7 @@
         "hours": "hours",
         "hours_report": "Hourly report",
         "more_hours": "more hours",
-        "submit": "submit"
+        "submit": "Submit"
       }
     },
     "community": "Community",
@@ -17,23 +17,23 @@
     "current-community": "Current community",
     "location": "Location:",
     "other-communities": "Other communities",
-    "switch-to-this-community": "switch to this community"
+    "switch-to-this-community": "Switch to this community"
   },
   "decay": {
     "calculation_decay": "Calculation of Decay",
-    "calculation_total": "Calculation of the grand total",
+    "calculation_total": "Calculation of the total Amount",
     "created": "Created",
     "days": "Days",
     "decay": "Decay",
     "decayStart": " - Starting block for decay at: ",
-    "decay_introduced": "Decay was Introduced on",
+    "decay_introduced": "Decay was introduced on",
     "decay_since_last_transaction": "Decay since the last transaction",
     "hours": "Hours",
     "last_transaction": "Last transaction:",
     "minutes": "Minutes",
     "months": "Months",
     "noDecay": "No Decay",
-    "past_time": "Past time",
+    "past_time": "Time passed",
     "received": "Received",
     "seconds": "Seconds",
     "sent": "Sent",
@@ -48,7 +48,7 @@
     "empty-transactionlist": "There was an error with the transmission of the number of your transactions.",
     "error": "Error",
     "no-account": "Unfortunately we could not find an account to the given data!",
-    "no-email-verify": "Your email is not activated yet, please check your emails and click the activation link!",
+    "no-email-verify": "Your account has not been confirmed yet. Please check your emails and click on the activation link!",
     "no-transactionlist": "Unfortunately, there was an error. No transactions have been sent from the server.",
     "session-expired": "The session was closed for security reasons."
   },
@@ -57,7 +57,7 @@
     "at": "at",
     "cancel": "Cancel",
     "close": "Close",
-    "current_balance": "current balance",
+    "current_balance": "Current Balance",
     "date": "Date",
     "description": "Description",
     "edit": "Edit",
@@ -67,7 +67,7 @@
     "lastname": "Lastname",
     "memo": "Message",
     "message": "Message",
-    "new_balance": "account balance after confirmation",
+    "new_balance": "Account balance after confirmation",
     "password": "Password",
     "passwordRepeat": "Repeat password",
     "password_new": "New password",
@@ -75,10 +75,10 @@
     "password_old": "Old password",
     "recipient": "Recipient",
     "reset": "Reset",
-    "save": "save",
+    "save": "Save",
     "scann_code": "<strong>QR Code Scanner</strong> - Scan the QR Code of your partner",
     "sender": "Sender",
-    "send_check": "Confirm your payment. Please check all data again!",
+    "send_check": "Confirm your transaction. Please check all data again!",
     "send_now": "Send now",
     "send_transaction_error": "Unfortunately, the transaction could not be executed!",
     "send_transaction_success": "Your transaction was successfully completed",
@@ -88,40 +88,40 @@
     "to": "to",
     "to1": "to",
     "validation": {
-      "gddSendAmount": "The {_field_} field must be a number between {min} and {max} with at most two digits",
+      "gddSendAmount": "The {_field_} field must be a number between {min} and {max} with at most two digits after the decimal point",
       "is-not": "You cannot send Gradidos to yourself",
       "usernmae-regex": "The username must start with a letter, followed by at least two alphanumeric characters.",
-      "usernmae-unique": "The username is already taken."
+      "usernmae-unique": "This username is already taken."
     },
     "your_amount": "Your amount"
   },
   "gdt": {
     "action": "Action",
-    "calculation": "Calculation of Gradido Transform",
+    "calculation": "Calculation of GradidoTransform",
     "contribution": "Contribution",
     "conversion": "Conversion",
-    "conversion-gdt-euro": "Conversion Euro / Gradido Transform (GDT)",
+    "conversion-gdt-euro": "Conversion Euro / GradidoTransform (GDT)",
     "credit": "Credit",
     "factor": "Factor",
     "formula": "Calculation formula",
-    "funding": "Regarding the funding contributions",
-    "gdt-received": "Gradido Transform (GDT) received",
-    "no-transactions": "You do not have Gradido Transform (GDT) yet.",
+    "funding": "To the funding contributions",
+    "gdt-received": "GradidoTransform (GDT) received",
+    "no-transactions": "You do not have GradidoTransform (GDT) yet.",
     "publisher": "A member you referred has paid a contribution",
     "raise": "Increase",
-    "recruited-member": "Recruited Member"
+    "recruited-member": "Invited member"
   },
   "imprint": "Legal notice",
   "language": "Language",
   "login": "Login",
   "logout": "Logout",
-  "members_area": "Member's area",
+  "members_area": "Members area",
   "message": "hello gradido !!",
   "overview": "Overview",
   "privacy_policy": "Privacy policy",
   "publisher": {
-    "infoNoRegister": "This is not necessary for registration!",
-    "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.",
+    "infoNoRegister": "This is not necessary for registration.",
+    "infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!",
     "publisherId": "PublisherID"
   },
   "send": "Send",
@@ -135,7 +135,7 @@
       "changeLanguage": "Change language",
       "de": "Deutsch",
       "en": "English",
-      "select_language": "Please choose a language.",
+      "select_language": "Please choose your language.",
       "success": "Your language has been successfully updated."
     },
     "name": {
@@ -143,23 +143,23 @@
       "change-success": "Your name has been successfully changed."
     },
     "newsletter": {
-      "newsletter": "Newsletter",
-      "newsletterFalse": "You will not receive any information by e-mail.",
-      "newsletterTrue": "You will receive information by e-mail."
+      "newsletter": "Information by email",
+      "newsletterFalse": "You will not receive any information by email.",
+      "newsletterTrue": "You will receive information by email."
     },
     "password": {
       "change-password": "Change password",
       "forgot_pwd": "Forgot password?",
       "not-authenticated": "Unfortunately we could not authenticate you. Please contact the support.",
-      "resend_subtitle": "Your activation link is expired, here you can order a new one.",
+      "resend_subtitle": "Your activation link has expired, here you can order a new one.",
       "reset": "Reset password",
       "reset-password": {
-        "text": "Now you can save a new password to login to the Gradido-App in the future."
+        "text": "Enter a new password that you will use to log in to your Gradido account in the future.."
       },
       "send_now": "Send now",
       "set": "Set password",
       "set-password": {
-        "text": "Now you can save a new password to login to the Gradido-App in the future."
+        "text": "Now save your new password, which you can use to log in to your Gradido account in the future."
       },
       "subtitle": "If you have forgotten your password, you can reset it here."
     }
@@ -167,9 +167,9 @@
   "signup": "Sign up",
   "site": {
     "404": {
-      "back": "Back to dashboard!",
+      "back": "Back to the overview",
       "ooops": "Ooops!",
-      "text": "Page not found. Do not worry though, we have plenty of other pages to explore"
+      "text": "Page not found. But don't worry, we have many other sites to explore."
     },
     "checkEmail": {
       "errorText": "Could not verify the email.",
@@ -197,7 +197,7 @@
       "uppercase": "One uppercase letter required."
     },
     "thx": {
-      "activateEmail": "Your email has not been activated yet, please check your emails and click the activation link!",
+      "activateEmail": "Your account has not been activated yet, please check your emails and click the activation link!",
       "checkEmail": "Your email has been successfully verified.",
       "email": "We have sent you an email.",
       "emailActivated": "Thank you your email has been activated.",
@@ -209,7 +209,7 @@
   },
   "transaction": {
     "gdd-text": "Gradido Transactions",
-    "gdt-text": "Gradido Transform Transactions",
+    "gdt-text": "GradidoTransform Transactions",
     "more": "more",
     "nullTransactions": "You don't have any transactions on your account yet.",
     "receiverNotFound": "Recipient not found",
diff --git a/frontend/src/main.js b/frontend/src/main.js
index edc9e575e..544dff66d 100755
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -28,7 +28,7 @@ Vue.toasted.register(
 
 loadAllRules(i18n)
 
-addNavigationGuards(router, store, apolloProvider.defaultClient)
+addNavigationGuards(router, store, apolloProvider.defaultClient, i18n)
 
 if (!store) {
   setTimeout(
diff --git a/frontend/src/routes/guards.js b/frontend/src/routes/guards.js
index 1838fa0fc..15d1eb5a1 100644
--- a/frontend/src/routes/guards.js
+++ b/frontend/src/routes/guards.js
@@ -1,6 +1,6 @@
 import { verifyLogin } from '../graphql/queries'
 
-const addNavigationGuards = (router, store, apollo) => {
+const addNavigationGuards = (router, store, apollo, i18n) => {
   // handle publisherId
   router.beforeEach((to, from, next) => {
     const publisherId = to.query.pid
@@ -21,6 +21,7 @@ const addNavigationGuards = (router, store, apollo) => {
           fetchPolicy: 'network-only',
         })
         .then((result) => {
+          i18n.locale = result.data.verifyLogin.language
           store.dispatch('login', result.data.verifyLogin)
           next({ path: '/overview' })
         })
diff --git a/frontend/src/routes/guards.test.js b/frontend/src/routes/guards.test.js
index fa9f60f56..d4d2869d4 100644
--- a/frontend/src/routes/guards.test.js
+++ b/frontend/src/routes/guards.test.js
@@ -23,7 +23,11 @@ const apollo = {
   query: apolloQueryMock,
 }
 
-addNavigationGuards(router, store, apollo)
+const i18n = {
+  locale: jest.fn(),
+}
+
+addNavigationGuards(router, store, apollo, i18n)
 
 describe('navigation guards', () => {
   beforeEach(() => {
diff --git a/frontend/src/routes/router.js b/frontend/src/routes/router.js
index b44c8ab7e..9cfee6242 100644
--- a/frontend/src/routes/router.js
+++ b/frontend/src/routes/router.js
@@ -5,7 +5,7 @@ import routes from './routes'
 Vue.use(VueRouter)
 
 const router = new VueRouter({
-  base: '/vue',
+  base: '/',
   routes,
   linkActiveClass: 'active',
   mode: 'history',
diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js
index bc2f3d340..f82065bc0 100644
--- a/frontend/src/routes/router.test.js
+++ b/frontend/src/routes/router.test.js
@@ -6,10 +6,10 @@ describe('router', () => {
     const { options } = router
     const { scrollBehavior, routes } = options
 
-    it('has "/vue" as base', () => {
+    it('has "/" as base', () => {
       expect(options).toEqual(
         expect.objectContaining({
-          base: '/vue',
+          base: '/',
         }),
       )
     })
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 418422997..fcb4e6fc6 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -50,7 +50,7 @@ const routes = [
     path: '/thx/:comingFrom',
     component: () => import('../views/Pages/thx.vue'),
     beforeEnter: (to, from, next) => {
-      const validFrom = ['password', 'reset', 'register', 'login', 'Login']
+      const validFrom = ['password', 'reset', 'register', 'login', 'checkEmail']
       if (!validFrom.includes(from.path.split('/')[1])) {
         next({ path: '/login' })
       } else {
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index 41a0540be..da108b9ff 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -124,13 +124,13 @@ describe('Vuex store', () => {
           name: 'test12',
           description: 'test community 12',
           url: 'http://test12.test12/',
-          registerUrl: 'http://test12.test12/vue/register',
+          registerUrl: 'http://test12.test12/register',
         })
         expect(state.community).toEqual({
           name: 'test12',
           description: 'test community 12',
           url: 'http://test12.test12/',
-          registerUrl: 'http://test12.test12/vue/register',
+          registerUrl: 'http://test12.test12/register',
         })
       })
     })
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.spec.js b/frontend/src/views/Layout/AuthLayout_gdd.spec.js
index aa05b772a..691cb3d0e 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.spec.js
+++ b/frontend/src/views/Layout/AuthLayout_gdd.spec.js
@@ -15,6 +15,7 @@ describe('AuthLayoutGdd', () => {
       meta: {
         hideFooter: false,
       },
+      path: '/',
     },
     $store: {
       state: {},
@@ -47,5 +48,20 @@ describe('AuthLayoutGdd', () => {
     it('has a footer inside the main content', () => {
       expect(wrapper.find('div.main-content').find('footer.footer').exists()).toBeTruthy()
     })
+
+    it('has LanguageSwitch', () => {
+      expect(wrapper.findComponent({ name: 'LanguageSwitch' }).exists()).toBeTruthy()
+    })
+
+    describe('check LanguageSwitch on register page', () => {
+      beforeEach(() => {
+        mocks.$route.path = '/register'
+        wrapper = Wrapper()
+      })
+
+      it('has not LanguageSwitch', () => {
+        expect(wrapper.findComponent({ name: 'LanguageSwitch' }).exists()).toBeFalsy()
+      })
+    })
   })
 })
diff --git a/frontend/src/views/Layout/AuthLayout_gdd.vue b/frontend/src/views/Layout/AuthLayout_gdd.vue
index 3ef8cb36f..4d0f8cb78 100644
--- a/frontend/src/views/Layout/AuthLayout_gdd.vue
+++ b/frontend/src/views/Layout/AuthLayout_gdd.vue
@@ -2,7 +2,7 @@
   <div class="wrapper">
     <div class="main-content mt-4">
       <router-view></router-view>
-      <language-switch class="text-center mb-5 mt-5" />
+      <language-switch v-if="$route.path !== '/register'" class="text-center mb-5 mt-5" />
       <content-footer v-if="!$route.meta.hideFooter"></content-footer>
     </div>
   </div>
diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue
index bd3bd8e4c..0c910bca5 100755
--- a/frontend/src/views/Layout/DashboardLayout_gdd.vue
+++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue
@@ -100,6 +100,7 @@ export default {
         })
         .catch((error) => {
           this.pending = true
+          this.transactionCount = -1
           this.$toasted.global.error(error.message)
           // what to do when loading balance fails?
         })
@@ -108,7 +109,7 @@ export default {
       this.balance -= ammount
     },
     admin() {
-      window.location.assign(CONFIG.ADMIN_AUTH_URL.replace('$1', this.$store.state.token))
+      window.location.assign(CONFIG.ADMIN_AUTH_URL.replace('{token}', this.$store.state.token))
       this.$store.dispatch('logout') // logout without redirect
     },
     setVisible(bool) {
diff --git a/frontend/src/views/Pages/AccountOverview.vue b/frontend/src/views/Pages/AccountOverview.vue
index 5cb04d9f0..f03a1f65b 100644
--- a/frontend/src/views/Pages/AccountOverview.vue
+++ b/frontend/src/views/Pages/AccountOverview.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div>
+    <div class="container-fluid">
       <b-row>
         <b-col class="col-6">
           <b-row>
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
index 55f65bee6..b116de9e8 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.spec.js
@@ -56,16 +56,20 @@ describe('GddTransactionList', () => {
         })
       })
       it('Transactions Array is empty, 0 transactions', () => {
-        expect(wrapper.find('div.test-empty-transactionlist').text()).toContain(
-          'error.empty-transactionlist',
-        )
+        expect(wrapper.find('div.test-empty-transactionlist').exists()).toBe(false)
       })
     })
 
     describe('without any properties', () => {
+      beforeEach(async () => {
+        await wrapper.setProps({
+          transactions: [],
+          transactionCount: -1,
+        })
+      })
       it('renders text saying that there are error.empty-transactionlist ', () => {
         expect(wrapper.find('div.gdd-transaction-list').text()).toContain(
-          'error.empty-transactionlist',
+          'transaction.nullTransactions',
         )
       })
       it('renders text saying that there are no transaction.nullTransactions', () => {
diff --git a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
index 955a6adc1..f6c046fe6 100644
--- a/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
+++ b/frontend/src/views/Pages/AccountOverview/GddTransactionList.vue
@@ -7,7 +7,7 @@
           {{ $t('error.no-transactionlist') }}
         </small>
       </div>
-      <div v-if="!transactionCount" class="test-empty-transactionlist text-right">
+      <div v-if="transactionCount < 0" class="test-empty-transactionlist text-right">
         <b-icon icon="exclamation-triangle" class="mr-2" style="color: red"></b-icon>
         <small>{{ $t('error.empty-transactionlist') }}</small>
       </div>
@@ -134,7 +134,7 @@
         :per-page="pageSize"
         :total-rows="transactionCount"
       ></pagination-buttons>
-      <div v-if="transactionCount === 0" class="mt-4 text-center">
+      <div v-if="transactionCount < 0" class="mt-4 text-center">
         <span>{{ $t('transaction.nullTransactions') }}</span>
       </div>
     </div>
diff --git a/frontend/src/views/Pages/ForgotPassword.spec.js b/frontend/src/views/Pages/ForgotPassword.spec.js
index 47c9fad56..41f1575cd 100644
--- a/frontend/src/views/Pages/ForgotPassword.spec.js
+++ b/frontend/src/views/Pages/ForgotPassword.spec.js
@@ -63,7 +63,7 @@ describe('ForgotPassword', () => {
       })
 
       it('links to login', () => {
-        expect(wrapper.findComponent(RouterLinkStub).props().to).toEqual('/Login')
+        expect(wrapper.findComponent(RouterLinkStub).props().to).toEqual('/login')
       })
     })
 
diff --git a/frontend/src/views/Pages/ForgotPassword.vue b/frontend/src/views/Pages/ForgotPassword.vue
index c8b31246f..654711dc7 100644
--- a/frontend/src/views/Pages/ForgotPassword.vue
+++ b/frontend/src/views/Pages/ForgotPassword.vue
@@ -32,7 +32,7 @@
         </b-col>
       </b-row>
       <div class="text-center py-lg-4">
-        <router-link to="/Login" class="mt-3">{{ $t('back') }}</router-link>
+        <router-link to="/login" class="mt-3">{{ $t('back') }}</router-link>
       </div>
     </b-container>
   </div>
diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js
index f9fde0e1e..ccca848ba 100644
--- a/frontend/src/views/Pages/Login.spec.js
+++ b/frontend/src/views/Pages/Login.spec.js
@@ -10,7 +10,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
       name: 'test12',
       description: 'test community 12',
       url: 'http://test12.test12/',
-      registerUrl: 'http://test12.test12/vue/register',
+      registerUrl: 'http://test12.test12/register',
     },
   },
 })
@@ -79,7 +79,7 @@ describe('Login', () => {
         name: 'test12',
         description: 'test community 12',
         url: 'http://test12.test12/',
-        registerUrl: 'http://test12.test12/vue/register',
+        registerUrl: 'http://test12.test12/register',
       })
     })
 
@@ -111,8 +111,8 @@ describe('Login', () => {
         jest.clearAllMocks()
         mocks.$store.state.community = {
           name: 'Gradido Entwicklung',
-          url: 'http://localhost/vue/',
-          registerUrl: 'http://localhost/vue/register',
+          url: 'http://localhost/',
+          registerUrl: 'http://localhost/register',
           description: 'Die lokale Entwicklungsumgebung von Gradido.',
         }
         wrapper = Wrapper()
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 820229a4a..56f97549d 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -11,7 +11,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
       name: 'test12',
       description: 'test community 12',
       url: 'http://test12.test12/',
-      registerUrl: 'http://test12.test12/vue/register',
+      registerUrl: 'http://test12.test12/register',
     },
   },
 })
@@ -73,7 +73,7 @@ describe('Register', () => {
         name: 'test12',
         description: 'test community 12',
         url: 'http://test12.test12/',
-        registerUrl: 'http://test12.test12/vue/register',
+        registerUrl: 'http://test12.test12/register',
       })
     })
 
@@ -105,8 +105,8 @@ describe('Register', () => {
         jest.clearAllMocks()
         mocks.$store.state.community = {
           name: 'Gradido Entwicklung',
-          url: 'http://localhost/vue/',
-          registerUrl: 'http://localhost/vue/register',
+          url: 'http://localhost/',
+          registerUrl: 'http://localhost/register',
           description: 'Die lokale Entwicklungsumgebung von Gradido.',
         }
         wrapper = Wrapper()
diff --git a/frontend/src/views/Pages/RegisterCommunity.spec.js b/frontend/src/views/Pages/RegisterCommunity.spec.js
index 477e5e08e..6d6574881 100644
--- a/frontend/src/views/Pages/RegisterCommunity.spec.js
+++ b/frontend/src/views/Pages/RegisterCommunity.spec.js
@@ -9,7 +9,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
       name: 'test12',
       description: 'test community 12',
       url: 'http://test12.test12/',
-      registerUrl: 'http://test12.test12/vue/register',
+      registerUrl: 'http://test12.test12/register',
     },
   },
 })
@@ -61,7 +61,7 @@ describe('RegisterCommunity', () => {
         name: 'test12',
         description: 'test community 12',
         url: 'http://test12.test12/',
-        registerUrl: 'http://test12.test12/vue/register',
+        registerUrl: 'http://test12.test12/register',
       })
     })
 
@@ -87,8 +87,8 @@ describe('RegisterCommunity', () => {
         jest.clearAllMocks()
         mocks.$store.state.community = {
           name: 'Gradido Entwicklung',
-          url: 'http://localhost/vue/',
-          registerUrl: 'http://localhost/vue/register',
+          url: 'http://localhost/',
+          registerUrl: 'http://localhost/register',
           description: 'Die lokale Entwicklungsumgebung von Gradido.',
         }
         wrapper = Wrapper()
diff --git a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js
index ad80c7e38..f4e980cd0 100644
--- a/frontend/src/views/Pages/RegisterSelectCommunity.spec.js
+++ b/frontend/src/views/Pages/RegisterSelectCommunity.spec.js
@@ -20,7 +20,7 @@ const apolloQueryMock = jest
         name: 'test12',
         description: 'test community 12',
         url: 'http://test12.test12/',
-        registerUrl: 'http://test12.test12/vue/register',
+        registerUrl: 'http://test12.test12/register',
       },
     },
   })
@@ -31,22 +31,22 @@ const apolloQueryMock = jest
           id: 1,
           name: 'Gradido Entwicklung',
           description: 'Die lokale Entwicklungsumgebung von Gradido.',
-          url: 'http://localhost/vue/',
-          registerUrl: 'http://localhost/vue/register-community',
+          url: 'http://localhost/',
+          registerUrl: 'http://localhost/register-community',
         },
         {
           id: 2,
           name: 'Gradido Staging',
           description: 'Der Testserver der Gradido-Akademie.',
-          url: 'https://stage1.gradido.net/vue/',
-          registerUrl: 'https://stage1.gradido.net/vue/register-community',
+          url: 'https://stage1.gradido.net/',
+          registerUrl: 'https://stage1.gradido.net/register-community',
         },
         {
           id: 3,
           name: 'Gradido-Akademie',
           description: 'Freies Institut für Wirtschaftsbionik.',
           url: 'https://gradido.net',
-          registerUrl: 'https://gdd1.gradido.com/vue/register-community',
+          registerUrl: 'https://gdd1.gradido.com/register-community',
         },
       ],
     },
@@ -139,8 +139,8 @@ describe('RegisterSelectCommunity', () => {
         mocks.$store.state.community = {
           name: 'Gradido Entwicklung',
           description: 'Die lokale Entwicklungsumgebung von Gradido.',
-          url: 'http://localhost/vue/',
-          registerUrl: 'http://localhost/vue/register-community',
+          url: 'http://localhost/',
+          registerUrl: 'http://localhost/register-community',
         }
         wrapper = Wrapper()
       })
@@ -172,15 +172,15 @@ describe('RegisterSelectCommunity', () => {
                 id: 2,
                 name: 'Gradido Staging',
                 description: 'Der Testserver der Gradido-Akademie.',
-                url: 'https://stage1.gradido.net/vue/',
-                registerUrl: 'https://stage1.gradido.net/vue/register-community',
+                url: 'https://stage1.gradido.net/',
+                registerUrl: 'https://stage1.gradido.net/register-community',
               },
               {
                 id: 3,
                 name: 'Gradido-Akademie',
                 description: 'Freies Institut für Wirtschaftsbionik.',
                 url: 'https://gradido.net',
-                registerUrl: 'https://gdd1.gradido.com/vue/register-community',
+                registerUrl: 'https://gdd1.gradido.com/register-community',
               },
             ],
           })
diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js
index f3bbc7334..e28d16c3e 100644
--- a/frontend/src/views/Pages/ResetPassword.spec.js
+++ b/frontend/src/views/Pages/ResetPassword.spec.js
@@ -28,6 +28,9 @@ const createMockObject = (comingFrom) => {
           optin: '123',
           comingFrom,
         },
+        path: {
+          includes: (t) => t,
+        },
       },
       $toasted: {
         global: {
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index 3e6aef339..05d8a0f6e 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -5,10 +5,10 @@
         <div class="header-body text-center mb-7">
           <b-row class="justify-content-center">
             <b-col xl="5" lg="6" md="8" class="px-2">
-              <h1>{{ $t('settings.password.reset') }}</h1>
+              <h1>{{ $t(displaySetup.authenticated) }}</h1>
               <div class="pb-4">
                 <span>
-                  {{ $t('settings.password.reset-password.text') }}
+                  {{ $t(displaySetup.notAuthenticated) }}
                 </span>
               </div>
             </b-col>
@@ -49,14 +49,14 @@ import { setPassword } from '../../graphql/mutations'
 
 const textFields = {
   reset: {
-    authenticated: 'settings.password.reset-password.text',
-    notAuthenticated: 'settings.password.not-authenticated',
-    button: 'settings.password.reset',
+    authenticated: 'settings.password.change-password',
+    notAuthenticated: 'settings.password.reset-password.text',
+    button: 'settings.password.change-password',
     linkTo: '/login',
   },
   checkEmail: {
-    authenticated: 'settings.password.set-password.text',
-    notAuthenticated: 'settings.password.not-authenticated',
+    authenticated: 'settings.password.set',
+    notAuthenticated: 'settings.password.set-password.text',
     button: 'settings.password.set',
     linkTo: '/login',
   },
@@ -95,19 +95,17 @@ export default {
           this.$router.push('/thx/reset')
         })
         .catch((error) => {
-          if (error.message.includes('Code is older than 10 minutes')) {
-            this.$toasted.global.error(error.message)
+          this.$toasted.global.error(error.message)
+          if (error.message.includes('Code is older than 10 minutes'))
             this.$router.push('/password/reset')
-          } else {
-            this.$toasted.global.error(error.message)
-          }
         })
     },
     setDisplaySetup() {
-      if (!this.$route.params.comingFrom) {
+      if (this.$route.path.includes('checkEmail')) {
+        this.displaySetup = textFields.checkEmail
+      }
+      if (this.$route.path.includes('reset')) {
         this.displaySetup = textFields.reset
-      } else {
-        this.displaySetup = textFields[this.$route.params.comingFrom]
       }
     },
   },
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
index 9f23c864d..84f8b60df 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserData.vue
@@ -3,7 +3,10 @@
     <div>
       <b-row class="mb-4 text-right">
         <b-col class="text-right">
-          <a @click="showUserData ? (showUserData = !showUserData) : cancelEdit()">
+          <a
+            class="cursor-pointer"
+            @click="showUserData ? (showUserData = !showUserData) : cancelEdit()"
+          >
             <span class="pointer mr-3">{{ $t('settings.name.change-name') }}</span>
             <b-icon v-if="showUserData" class="pointer ml-3" icon="pencil"></b-icon>
             <b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon>
@@ -130,4 +133,8 @@ export default {
   },
 }
 </script>
-<style></style>
+<style>
+.cursor-pointer {
+  cursor: pointer;
+}
+</style>
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
index 54ad39431..e67304e02 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_FormUserPasswort.vue
@@ -3,7 +3,10 @@
     <div>
       <b-row class="mb-4 text-right">
         <b-col class="text-right">
-          <a @click="showPassword ? (showPassword = !showPassword) : cancelEdit()">
+          <a
+            class="cursor-pointer"
+            @click="showPassword ? (showPassword = !showPassword) : cancelEdit()"
+          >
             <span class="pointer mr-3">{{ $t('settings.password.change-password') }}</span>
             <b-icon v-if="showPassword" class="pointer ml-3" icon="pencil"></b-icon>
             <b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon>
@@ -91,3 +94,8 @@ export default {
   },
 }
 </script>
+<style>
+.cursor-pointer {
+  cursor: pointer;
+}
+</style>
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
index b53d08189..dfaf6cf55 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
@@ -3,7 +3,10 @@
     <div>
       <b-row class="mb-4 text-right">
         <b-col class="text-right">
-          <a @click="showLanguage ? (showLanguage = !showLanguage) : cancelEdit()">
+          <a
+            class="cursor-pointer"
+            @click="showLanguage ? (showLanguage = !showLanguage) : cancelEdit()"
+          >
             <span class="pointer mr-3">{{ $t('settings.language.changeLanguage') }}</span>
             <b-icon v-if="showLanguage" class="pointer ml-3" icon="pencil"></b-icon>
             <b-icon v-else icon="x-circle" class="pointer ml-3" variant="danger"></b-icon>
@@ -110,3 +113,8 @@ export default {
   },
 }
 </script>
+<style>
+.cursor-pointer {
+  cursor: pointer;
+}
+</style>
diff --git a/frontend/src/views/Pages/thx.spec.js b/frontend/src/views/Pages/thx.spec.js
index f1bc59b80..16c5e3ffc 100644
--- a/frontend/src/views/Pages/thx.spec.js
+++ b/frontend/src/views/Pages/thx.spec.js
@@ -88,4 +88,22 @@ describe('Thx', () => {
       expect(wrapper.find('a.btn').attributes('href')).toBe('/overview')
     })
   })
+
+  describe('coming from /login', () => {
+    beforeEach(() => {
+      wrapper = Wrapper(createMockObject('login'))
+    })
+
+    it('renders the thanks text', () => {
+      expect(wrapper.find('p.h4').text()).toBe('site.thx.activateEmail')
+    })
+
+    it('renders the thanks redirect button', () => {
+      expect(wrapper.find('a.btn').text()).toBe('login')
+    })
+
+    it('links the redirect button to /login', () => {
+      expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
+    })
+  })
 })
diff --git a/frontend/src/views/Pages/thx.vue b/frontend/src/views/Pages/thx.vue
index 5884cc61c..109f03573 100644
--- a/frontend/src/views/Pages/thx.vue
+++ b/frontend/src/views/Pages/thx.vue
@@ -45,6 +45,8 @@ const textFields = {
   login: {
     headline: 'site.thx.errorTitle',
     subtitle: 'site.thx.activateEmail',
+    button: 'login',
+    linkTo: '/login',
   },
 }
 
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 88dae8c4c..47b016aea 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -17,7 +17,7 @@ module.exports = {
     },
   },
   lintOnSave: true,
-  publicPath: '/vue',
+  publicPath: '/',
   configureWebpack: {
     // Set up all the aliases we use in our app.
     resolve: {
diff --git a/login_server/README.md b/login_server/README.md
index 118d0d53c..0628fc800 100644
--- a/login_server/README.md
+++ b/login_server/README.md
@@ -113,7 +113,7 @@ loginServer.db.password =
 loginServer.db.port = 3306
 
 # check email path for new frontend for link generation in emails
-frontend.checkEmailPath = http://localhost/vue/reset
+frontend.checkEmailPath = http://localhost/reset
 
 # disable email all together
 email.disable = true
diff --git a/login_server/src/cpsp/Login.cpsp b/login_server/src/cpsp/Login.cpsp
index 6ddd8a066..4ee21ecae 100644
--- a/login_server/src/cpsp/Login.cpsp
+++ b/login_server/src/cpsp/Login.cpsp
@@ -299,7 +299,7 @@
 		  </a>
 	    </div>
 		<div class="reset-pwd-link">
-			<a href="<%= getHost() %>/vue/password"><%= langCatalog->gettext("Passwort vergessen") %></a>
+			<a href="<%= getHost() %>/password"><%= langCatalog->gettext("Passwort vergessen") %></a>
 		</div>
 	</div>
 </div>
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 225d16ed8..dc4ecb826 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,10 +1,3 @@
 FROM nginx:1.21.0
 
-WORKDIR /var/www/cakephp
-
-COPY ./nginx/nginx.conf /etc/nginx/conf.d/default.conf
-COPY ./nginx/fastcgi.conf /etc/nginx/
-COPY ./nginx/mime.types /etc/nginx/
-
-COPY ./community_server/webroot webroot
-
+COPY ./gradido.conf /etc/nginx/conf.d/default.conf
\ No newline at end of file
diff --git a/nginx/fastcgi.conf b/nginx/fastcgi.conf
deleted file mode 100644
index 238f7869f..000000000
--- a/nginx/fastcgi.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
-fastcgi_param  QUERY_STRING       $query_string;
-fastcgi_param  REQUEST_METHOD     $request_method;
-fastcgi_param  CONTENT_TYPE       $content_type;
-fastcgi_param  CONTENT_LENGTH     $content_length;
-
-fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-fastcgi_param  REQUEST_URI        $request_uri;
-fastcgi_param  DOCUMENT_URI       $document_uri;
-fastcgi_param  DOCUMENT_ROOT      $document_root;
-fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-fastcgi_param  REQUEST_SCHEME     $scheme;
-fastcgi_param  HTTPS              $https if_not_empty;
-
-fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
-
-fastcgi_param  REMOTE_ADDR        $remote_addr;
-fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  SERVER_ADDR        $server_addr;
-fastcgi_param  SERVER_PORT        $server_port;
-fastcgi_param  SERVER_NAME        $server_name;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param  REDIRECT_STATUS    200;
\ No newline at end of file
diff --git a/nginx/gradido.conf b/nginx/gradido.conf
new file mode 100644
index 000000000..bfb079d32
--- /dev/null
+++ b/nginx/gradido.conf
@@ -0,0 +1,84 @@
+server {
+    server_name $NGINX_SERVER_NAME;
+
+    listen 80;
+    listen [::]:80;
+
+    #include /etc/nginx/common/protect.conf;
+    #include /etc/nginx/common/protect_add_header.conf;
+	#include /etc/nginx/common/ssl.conf;
+
+    #gzip_static  on;
+
+    # Legacy URLS
+    set $REWRITE_LEGACY_URLS "true";
+    if ($REWRITE_LEGACY_URLS = 'true') {
+        rewrite ^/vue/?(.*)$ /$1 permanent;
+    }
+
+    # Frontend (default)
+    location / {
+		proxy_http_version 1.1;
+		proxy_set_header   Upgrade $http_upgrade;
+		proxy_set_header   Connection 'upgrade';
+		proxy_set_header   X-Forwarded-For $remote_addr;
+		proxy_set_header   X-Real-IP  $remote_addr;
+		proxy_set_header   Host $host;
+		
+		proxy_pass         http://frontend:3000;
+		proxy_redirect     off;
+	}
+
+    # Backend
+    location /graphql {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://backend:4000;
+        proxy_redirect     off;
+    }
+
+    # Backend webhooks
+    location /hook {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+        
+        proxy_pass         http://backend:4000/hook;
+        proxy_redirect     off;
+    }
+
+    # Admin Frontend
+    location /admin {
+        proxy_http_version 1.1;
+        proxy_set_header   Upgrade $http_upgrade;
+        proxy_set_header   Connection 'upgrade';
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   Host $host;
+      
+        # TODO: in docker environemnt we do not have the trailing slash. This needs work
+        proxy_pass         http://admin:8080;
+        proxy_redirect     off;
+    }
+
+    # TODO this could be a performance optimization
+    #location /vue {
+    #    alias /var/www/html/gradido/frontend/dist;
+    #    index index.html;
+    #
+    #    location ~* \.(png)$ {
+    #        expires 39d;
+    #    }
+    #    try_files $uri $uri/ /index.html = 404;
+    #}
+
+    #access_log /var/log/nginx/access.log main;
+}
\ No newline at end of file
diff --git a/nginx/mime.types b/nginx/mime.types
deleted file mode 100644
index cd3d700ea..000000000
--- a/nginx/mime.types
+++ /dev/null
@@ -1,88 +0,0 @@
-types {
-    text/html                             html htm shtml;
-    text/css                              css;
-    text/xml                              xml;
-    image/gif                             gif;
-    image/jpeg                            jpeg jpg;
-    application/javascript                js;
-    application/atom+xml                  atom;
-    application/rss+xml                   rss;
-
-    text/mathml                           mml;
-    text/plain                            txt;
-    text/vnd.sun.j2me.app-descriptor      jad;
-    text/vnd.wap.wml                      wml;
-    text/x-component                      htc;
-
-    image/png                             png;
-    image/tiff                            tif tiff;
-    image/vnd.wap.wbmp                    wbmp;
-    image/x-icon                          ico;
-    image/x-jng                           jng;
-    image/x-ms-bmp                        bmp;
-    image/svg+xml                         svg svgz;
-    image/webp                            webp;
-
-    application/font-woff                 woff;
-    application/java-archive              jar war ear;
-    application/json                      json;
-    application/mac-binhex40              hqx;
-    application/msword                    doc;
-    application/pdf                       pdf;
-    application/postscript                ps eps ai;
-    application/rtf                       rtf;
-    application/vnd.apple.mpegurl         m3u8;
-    application/vnd.ms-excel              xls;
-    application/vnd.ms-fontobject         eot;
-    application/vnd.ms-powerpoint         ppt;
-    application/vnd.wap.wmlc              wmlc;
-    application/vnd.google-earth.kml+xml  kml;
-    application/vnd.google-earth.kmz      kmz;
-    application/x-7z-compressed           7z;
-    application/x-cocoa                   cco;
-    application/x-java-archive-diff       jardiff;
-    application/x-java-jnlp-file          jnlp;
-    application/x-makeself                run;
-    application/x-perl                    pl pm;
-    application/x-pilot                   prc pdb;
-    application/x-rar-compressed          rar;
-    application/x-redhat-package-manager  rpm;
-    application/x-sea                     sea;
-    application/x-shockwave-flash         swf;
-    application/x-stuffit                 sit;
-    application/x-tcl                     tcl tk;
-    application/x-x509-ca-cert            der pem crt;
-    application/x-xpinstall               xpi;
-    application/xhtml+xml                 xhtml;
-    application/xspf+xml                  xspf;
-    application/zip                       zip;
-
-    application/octet-stream              bin exe dll;
-    application/octet-stream              deb;
-    application/octet-stream              dmg;
-    application/octet-stream              iso img;
-    application/octet-stream              msi msp msm;
-
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;
-
-    audio/midi                            mid midi kar;
-    audio/mpeg                            mp3;
-    audio/ogg                             ogg;
-    audio/x-m4a                           m4a;
-    audio/x-realaudio                     ra;
-
-    video/3gpp                            3gpp 3gp;
-    video/mp2t                            ts;
-    video/mp4                             mp4;
-    video/mpeg                            mpeg mpg;
-    video/quicktime                       mov;
-    video/webm                            webm;
-    video/x-flv                           flv;
-    video/x-m4v                           m4v;
-    video/x-mng                           mng;
-    video/x-ms-asf                        asx asf;
-    video/x-ms-wmv                        wmv;
-    video/x-msvideo                       avi;
-}
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
deleted file mode 100644
index 48d703997..000000000
--- a/nginx/nginx.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-server {
-
-	listen 80 ;
-	listen [::]:80;
-	server_name 0.0.0.0;
-
-	#include /etc/nginx/common/protect.conf;
-	#include /etc/nginx/common/protect_add_header.conf;
-	#include /etc/nginx/common/ssl.conf;	
-	
-	root /var/www/cakephp/webroot;
-	index index.php;
-
-	location ~ \.php$ {
-	  fastcgi_pass community-server:9000;
-	  fastcgi_index index.php;
-	  fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-	  # fastcgi_param PHP_VALUE "error_log=/var/www/myapp/logs/php_errors.log";
-	  fastcgi_buffers 16 16k;
-	  fastcgi_buffer_size 32k;
-	  include fastcgi_params;
-	}
-
-	location ~ /\.ht {
-	  deny  all;
-	}
-
-	location /account {
-		proxy_http_version 1.1;
-		proxy_set_header    Upgrade $http_upgrade;
-		proxy_set_header    Connection 'upgrade';
-		proxy_cache_bypass  $http_upgrade;
-		proxy_set_header    X-Real-IP  $remote_addr;
-		proxy_set_header    X-Forwarded-For $remote_addr;
-		proxy_set_header    Host $host;
-		rewrite  /account/(.*) /$1 break;
-
-		proxy_pass          http://login-server:1200;
-		proxy_redirect      off;
-	}
-	
-	location /login_api {
-		proxy_http_version 1.1;
-		proxy_set_header    Upgrade $http_upgrade;
-		proxy_set_header    Connection 'upgrade';
-		proxy_cache_bypass  $http_upgrade;
-		proxy_set_header    X-Real-IP  $remote_addr;
-		proxy_set_header    X-Forwarded-For $remote_addr;
-		proxy_set_header    Host $host;
-		rewrite  /login_api/(.*) /$1 break;
-
-		proxy_pass          http://login-server:1201;
-		proxy_redirect      off;
-	}
-
-	location / {
-		try_files $uri $uri/ /index.php?$args;
-	}
-	
-	location /vue {
-		proxy_http_version 1.1;
-		proxy_set_header   Upgrade $http_upgrade;
-		proxy_set_header   Connection 'upgrade';
-		proxy_set_header   X-Forwarded-For $remote_addr;
-		proxy_set_header   X-Real-IP  $remote_addr;
-		proxy_set_header   Host $host;
-		
-		proxy_pass         http://frontend:3000;
-		proxy_redirect     off;
-	}
-
-	location /admin {
-		proxy_http_version 1.1;
-		proxy_set_header   Upgrade $http_upgrade;
-		proxy_set_header   Connection 'upgrade';
-		proxy_set_header   X-Forwarded-For $remote_addr;
-		proxy_set_header   X-Real-IP  $remote_addr;
-		proxy_set_header   Host $host;
-		
-		proxy_pass         http://admin:8080;
-		proxy_redirect     off;
-	}
-
-location /sockjs-node {
-		proxy_http_version 1.1;
-		proxy_set_header   Upgrade $http_upgrade;
-		proxy_set_header   Connection 'upgrade';
-		proxy_set_header   X-Forwarded-For $remote_addr;
-		proxy_set_header   X-Real-IP  $remote_addr;
-		proxy_set_header   Host $host;
-		
-		proxy_pass         http://frontend:3000;
-		proxy_redirect     off;
-	}
-
-#	access_log /var/log/nginx/access.log main;
-
-}
\ No newline at end of file