diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 08665fd04..7dad57d93 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -37,9 +37,9 @@ services:
   #########################################################
   ## COMMUNITY SERVER (cakephp with php-fpm) ##############
   #########################################################
-  community-server:
-    volumes:
-      - ./community_server
+  #community-server:
+  #  volumes:
+  #    - ./community_server
 
       
   #########################################################
diff --git a/frontend/src/apis/loginAPI.js b/frontend/src/apis/loginAPI.js
index d422fe3ff..91020ddbb 100644
--- a/frontend/src/apis/loginAPI.js
+++ b/frontend/src/apis/loginAPI.js
@@ -63,6 +63,15 @@ const loginAPI = {
     }
     return apiPost(CONFIG.LOGIN_API_URL + 'createUser', payload)
   },
+  sendEmail: async (email, email_text = 7, email_verification_code_type = 'resetPassword') => {
+    //console.log('api email', email)
+    const payload = {
+      email,
+      email_text,
+      email_verification_code_type,
+    }
+    return apiPost(CONFIG.LOGIN_API_URL + 'sendEmail', payload)
+  },
 }
 
 export default loginAPI
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index dc30e5754..adae0be07 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -9,7 +9,7 @@ const routes = [
   },
   {
     path: '/overview',
-    component: () => import('../views/KontoOverview.vue'),
+    component: () => import('../views/Pages/KontoOverview.vue'),
     meta: {
       requiresAuth: true,
     },
@@ -56,7 +56,11 @@ const routes = [
   },
   {
     path: '/password',
-    component: () => import('../views/Pages/Password.vue'),
+    component: () => import('../views/Pages/ForgotPassword.vue'),
+  },
+  {
+    path: '/reset',
+    component: () => import('../views/Pages/ResetPassword.vue'),
   },
   { path: '*', component: NotFound },
 ]
diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index f033921a9..357205847 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -48,7 +48,6 @@ export const store = new Vuex.Store({
       state.user.balance_gdt = balance / 10000
     },
   },
-  // Asyncronous actions - used for api calls
   actions: {
     login: async ({ dispatch, commit }, data) => {
       commit('session_id', data.session_id)
diff --git a/frontend/src/views/Pages/Password.vue b/frontend/src/views/Pages/ForgotPassword.vue
similarity index 79%
rename from frontend/src/views/Pages/Password.vue
rename to frontend/src/views/Pages/ForgotPassword.vue
index 0db2a2725..d99d7731e 100644
--- a/frontend/src/views/Pages/Password.vue
+++ b/frontend/src/views/Pages/ForgotPassword.vue
@@ -26,17 +26,10 @@
                     :placeholder="$t('form.email')"
                     name="Email"
                     :rules="{ required: true, email: true }"
-                    v-model="model.email"
+                    v-model="form.email"
                   ></base-input>
-                  {{ form }}
                   <div class="text-center">
-                    <b-button
-                      type="submit"
-                      outline
-                      variant="secondary"
-                      class="mt-4"
-                      :disabled="disable"
-                    >
+                    <b-button type="submit" outline variant="secondary" class="mt-4">
                       {{ $t('site.password.reset_now') }}
                     </b-button>
                   </div>
@@ -53,21 +46,26 @@
   </div>
 </template>
 <script>
+import loginAPI from '../../apis/loginAPI.js'
+
 export default {
   name: 'password',
   data() {
     return {
       disable: 'disabled',
-      model: {
+      form: {
         email: '',
       },
     }
   },
   methods: {
-    onSubmit() {
-      this.$store.dispatch('passwordReset', { email: this.model.email })
-      this.model.email = ''
-      this.$router.push('/thx')
+    async onSubmit() {
+      const result = await loginAPI.sendEmail(this.form.email)
+      if (result.success) {
+        this.$router.push({ path: '/thx', params: { id: 'resetmail' } })
+      } else {
+        alert(result.result)
+      }
     },
   },
 }
diff --git a/frontend/src/views/KontoOverview.spec.js b/frontend/src/views/Pages/KontoOverview.spec.js
similarity index 100%
rename from frontend/src/views/KontoOverview.spec.js
rename to frontend/src/views/Pages/KontoOverview.spec.js
diff --git a/frontend/src/views/KontoOverview.vue b/frontend/src/views/Pages/KontoOverview.vue
similarity index 88%
rename from frontend/src/views/KontoOverview.vue
rename to frontend/src/views/Pages/KontoOverview.vue
index 114e6cf11..10942b7f5 100644
--- a/frontend/src/views/KontoOverview.vue
+++ b/frontend/src/views/Pages/KontoOverview.vue
@@ -20,9 +20,9 @@
   </div>
 </template>
 <script>
-import GddStatus from './KontoOverview/GddStatus.vue'
-import GddSend from './KontoOverview/GddSend.vue'
-import GddTable from './KontoOverview/GddTable.vue'
+import GddStatus from '../KontoOverview/GddStatus.vue'
+import GddSend from '../KontoOverview/GddSend.vue'
+import GddTable from '../KontoOverview/GddTable.vue'
 
 export default {
   name: 'Overview',
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 08f48d9dd..8391ba907 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -89,6 +89,9 @@
               </router-link>
             </b-col>
           </b-row>
+          <b-row>
+            <b-col><router-link to="/reset">reset</router-link></b-col>
+          </b-row>
         </b-col>
       </b-row>
     </b-container>
diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js
new file mode 100644
index 000000000..ebff0fc20
--- /dev/null
+++ b/frontend/src/views/Pages/ResetPassword.spec.js
@@ -0,0 +1,107 @@
+import { mount, RouterLinkStub } from '@vue/test-utils'
+import Vuex from 'vuex'
+import flushPromises from 'flush-promises'
+
+import ResetPassword from './ResetPassword'
+
+const localVue = global.localVue
+
+describe('ResetPassword', () => {
+  let wrapper
+
+  let mocks = {
+    $i18n: {
+      locale: 'en',
+    },
+    $t: jest.fn((t) => t),
+  }
+
+  let state = {
+    // loginfail: false,
+  }
+
+  let store = new Vuex.Store({
+    state,
+  })
+
+  let stubs = {
+    RouterLink: RouterLinkStub,
+  }
+
+  const Wrapper = () => {
+    return mount(ResetPassword, { localVue, mocks, store, stubs })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders the Reset Password form', () => {
+      expect(wrapper.find('div.resetpwd-form').exists()).toBeTruthy()
+    })
+
+    //describe('Register header', () => {
+    //  it('has a welcome message', () => {
+    //    expect(wrapper.find('div.header').text()).toBe('site.signup.title site.signup.subtitle')
+    //  })
+    //})
+
+    //describe('links', () => {
+    //  it('has a link "Back"', () => {
+    //    expect(wrapper.findAllComponents(RouterLinkStub).at(0).text()).toEqual('back')
+    //  })
+
+    //  it('links to /login when clicking "Back"', () => {
+    //    expect(wrapper.findAllComponents(RouterLinkStub).at(0).props().to).toBe('/login')
+    //  })
+    //})
+
+    //describe('Register form', () => {
+    //  it('has a register form', () => {
+    //    expect(wrapper.find('form').exists()).toBeTruthy()
+    //  })
+
+    //  it('has 3 text input fields', () => {
+    //    expect(wrapper.findAll('input[type="text"]').length).toBe(3)
+    //  })
+
+    //  it('has 2 password input fields', () => {
+    //    expect(wrapper.findAll('input[type="password"]').length).toBe(2)
+    //  })
+
+    //  it('has 1 checkbox input fields', () => {
+    //    expect(wrapper.findAll('input[type="checkbox"]').length).toBe(1)
+    //  })
+
+    //  it('has no submit button when not completely filled', () => {
+    //    expect(wrapper.find('button[type="submit"]').exists()).toBe(false)
+    //  })
+
+    //  it('shows a warning when no valid Email is entered', async () => {
+    //    wrapper.findAll('input[type="text"]').at(2).setValue('no_valid@Email')
+    //    await flushPromises()
+    //    await expect(wrapper.find('.invalid-feedback').text()).toEqual(
+    //      'The Email field must be a valid email',
+    //    )
+    //  })
+
+    //  it('shows 4 warnings when no password is set', async () => {
+    //    const passwords = wrapper.findAll('input[type="password"]')
+    //    passwords.at(0).setValue('')
+    //    passwords.at(1).setValue('')
+    //    await flushPromises()
+    //    await expect(wrapper.find('div.hints').text()).toContain(
+    //      'site.signup.lowercase',
+    //      'site.signup.uppercase',
+    //      'site.signup.minimum',
+    //      'site.signup.one_number',
+    //    )
+    //  })
+
+    //  //TODO test different invalid password combinations
+    //})
+
+    // TODO test submit button
+  })
+})
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
new file mode 100644
index 000000000..145fba404
--- /dev/null
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -0,0 +1,147 @@
+<template>
+  <div class="resetpwd-form">
+    <!-- Header -->
+    <div class="header p-4">
+      <b-container class="container">
+        <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>Reset Password</h1>
+              <div class="pb-4">
+                Jetzt kannst du ein neues Passwort speichern, mit welchem du dich zukünfitg in der
+                GRADIDO App anmelden kannst.
+              </div>
+            </b-col>
+          </b-row>
+        </div>
+      </b-container>
+    </div>
+    <!-- Page content -->
+    <b-container class="mt--8 p-1">
+      <!-- Table -->
+      <b-row class="justify-content-center">
+        <b-col lg="6" md="8">
+          <b-card no-body class="border-0" style="background-color: #ebebeba3 !important">
+            <b-card-body class="py-lg-4 px-sm-0 px-0 px-md-2 px-lg-4">
+              <validation-observer v-slot="{ handleSubmit }" ref="formValidator">
+                <b-form role="form" @submit.prevent="handleSubmit(onSubmit)">
+                  <b-form-group :label="$t('form.password')">
+                    <b-input-group>
+                      <b-form-input
+                        class="mb-0"
+                        v-model="password"
+                        name="password"
+                        :class="{ valid: passwordValidation.valid }"
+                        :type="passwordVisible ? 'text' : 'password'"
+                        prepend-icon="ni ni-lock-circle-open"
+                        :placeholder="$t('form.password')"
+                      ></b-form-input>
+
+                      <b-input-group-append>
+                        <b-button variant="outline-primary">
+                          <b-icon
+                            :icon="passwordVisible ? 'eye' : 'eye-slash'"
+                            @click="togglePasswordVisibility"
+                          />
+                        </b-button>
+                      </b-input-group-append>
+                    </b-input-group>
+                  </b-form-group>
+
+                  <base-input
+                    :label="$t('form.password_repeat')"
+                    type="password"
+                    name="password-repeat"
+                    :placeholder="$t('form.password_repeat')"
+                    prepend-icon="ni ni-lock-circle-open"
+                    v-model.lazy="checkPassword"
+                    :class="{ valid: passwordValidation.valid }"
+                  />
+
+                  <transition name="hint" appear>
+                    <div v-if="passwordValidation.errors.length > 0 && !submitted" class="hints">
+                      <ul>
+                        <li v-for="error in passwordValidation.errors" :key="error">
+                          <small>{{ error }}</small>
+                        </li>
+                      </ul>
+                    </div>
+                    <div class="matches" v-else-if="!samePasswords">
+                      <p>
+                        {{ $t('site.signup.dont_match') }}
+                        <i class="ni ni-active-40" color="danger"></i>
+                      </p>
+                    </div>
+                  </transition>
+                  <div
+                    class="text-center"
+                    v-if="passwordsFilled && samePasswords && passwordValidation.valid"
+                  >
+                    <b-button type="submit" variant="secondary" class="mt-4">
+                      {{ $t('signup') }}
+                    </b-button>
+                  </div>
+                </b-form>
+              </validation-observer>
+            </b-card-body>
+          </b-card>
+        </b-col>
+      </b-row>
+    </b-container>
+  </div>
+</template>
+<script>
+export default {
+  name: 'reset',
+  data() {
+    return {
+      rules: [
+        { message: this.$t('site.signup.lowercase'), regex: /[a-z]+/ },
+        { message: this.$t('site.signup.uppercase'), regex: /[A-Z]+/ },
+        { message: this.$t('site.signup.minimum'), regex: /.{8,}/ },
+        { message: this.$t('site.signup.one_number'), regex: /[0-9]+/ },
+      ],
+      password: '',
+      checkPassword: '',
+      passwordVisible: false,
+      submitted: false,
+    }
+  },
+  methods: {
+    togglePasswordVisibility() {
+      this.passwordVisible = !this.passwordVisible
+    },
+    onSubmit() {
+      this.$store.dispatch('createUser', {
+        password: this.model.password,
+      })
+      this.model.password = ''
+      this.$router.push('/thx')
+    },
+  },
+  computed: {
+    samePasswords() {
+      return this.password === this.checkPassword
+    },
+    passwordsFilled() {
+      return this.password !== '' && this.checkPassword !== ''
+    },
+    passwordValidation() {
+      let errors = []
+      for (let condition of this.rules) {
+        if (!condition.regex.test(this.password)) {
+          errors.push(condition.message)
+        }
+      }
+      if (errors.length === 0) {
+        return { valid: true, errors }
+      }
+      return { valid: false, errors }
+    },
+  },
+  created() {
+    //console.log('resetpage', this.$route)
+  },
+}
+</script>
+<style></style>