diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index a3c1389ce..8f716ff72 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -73,7 +73,7 @@ const routes = [
   },
   {
     path: '/checkEmail/:optin',
-    component: () => import('../views/Pages/CheckEmail.vue'),
+    component: () => import('../views/Pages/ResetPassword.vue'),
   },
   { path: '*', component: NotFound },
 ]
diff --git a/frontend/src/views/Pages/CheckEmail.spec.js b/frontend/src/views/Pages/CheckEmail.spec.js
deleted file mode 100644
index 2513d4b3f..000000000
--- a/frontend/src/views/Pages/CheckEmail.spec.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import { mount, RouterLinkStub } from '@vue/test-utils'
-import CheckEmail from './CheckEmail'
-
-const localVue = global.localVue
-
-const apolloQueryMock = jest.fn().mockRejectedValue({ message: 'error' })
-
-const toasterMock = jest.fn()
-const routerPushMock = jest.fn()
-
-describe('CheckEmail', () => {
-  let wrapper
-
-  const mocks = {
-    $i18n: {
-      locale: 'en',
-    },
-    $t: jest.fn((t) => t),
-    $route: {
-      params: {
-        optin: '123',
-      },
-    },
-    $toasted: {
-      error: toasterMock,
-    },
-    $router: {
-      push: routerPushMock,
-    },
-    $loading: {
-      show: jest.fn(() => {
-        return { hide: jest.fn() }
-      }),
-    },
-    $apollo: {
-      query: apolloQueryMock,
-    },
-  }
-
-  const stubs = {
-    RouterLink: RouterLinkStub,
-  }
-
-  const Wrapper = () => {
-    return mount(CheckEmail, { localVue, mocks, stubs })
-  }
-
-  describe('mount', () => {
-    beforeEach(() => {
-      wrapper = Wrapper()
-    })
-
-    it('calls the checkEmail when created', async () => {
-      expect(apolloQueryMock).toBeCalledWith(
-        expect.objectContaining({ variables: { optin: '123' } }),
-      )
-    })
-
-    describe('No valid optin', () => {
-      it('toasts an error when no valid optin is given', () => {
-        expect(toasterMock).toHaveBeenCalledWith('error')
-      })
-
-      it('has a message suggesting to contact the support', () => {
-        expect(wrapper.find('div.header').text()).toContain('checkEmail.title')
-        expect(wrapper.find('div.header').text()).toContain('checkEmail.errorText')
-      })
-    })
-
-    describe('is authenticated', () => {
-      beforeEach(() => {
-        apolloQueryMock.mockResolvedValue({
-          data: {
-            checkEmail: {
-              sessionId: 1,
-              email: 'user@example.org',
-              language: 'de',
-            },
-          },
-        })
-      })
-
-      it.skip('Has sessionId from API call', async () => {
-        await wrapper.vm.$nextTick()
-        expect(wrapper.vm.sessionId).toBe(1)
-      })
-
-      describe('Register header', () => {
-        it('has a welcome message', async () => {
-          expect(wrapper.find('div.header').text()).toContain('checkEmail.title')
-        })
-      })
-
-      describe('links', () => {
-        it('has a link "Back"', async () => {
-          expect(wrapper.findAllComponents(RouterLinkStub).at(0).text()).toEqual('back')
-        })
-
-        it('links to /login when clicking "Back"', async () => {
-          expect(wrapper.findAllComponents(RouterLinkStub).at(0).props().to).toBe('/Login')
-        })
-      })
-    })
-  })
-})
diff --git a/frontend/src/views/Pages/CheckEmail.vue b/frontend/src/views/Pages/CheckEmail.vue
deleted file mode 100644
index 1a23f6b09..000000000
--- a/frontend/src/views/Pages/CheckEmail.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <div class="checkemail-form">
-    <b-container>
-      <div class="header p-4" ref="header">
-        <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('site.checkEmail.title') }}</h1>
-              <div class="pb-4" v-if="!pending">
-                <span v-if="!authenticated">
-                  {{ $t('site.checkEmail.errorText') }}
-                </span>
-              </div>
-            </b-col>
-          </b-row>
-        </div>
-      </div>
-    </b-container>
-    <b-container class="mt--8 p-1">
-      <b-row>
-        <b-col class="text-center py-lg-4">
-          <router-link to="/Login" class="mt-3">{{ $t('back') }}</router-link>
-        </b-col>
-      </b-row>
-    </b-container>
-  </div>
-</template>
-<script>
-import { checkEmailQuery } from '../../graphql/queries'
-
-export default {
-  name: 'CheckEmail',
-  data() {
-    return {
-      authenticated: false,
-      sessionId: null,
-      email: null,
-      pending: true,
-    }
-  },
-  methods: {
-    async authenticate() {
-      const loader = this.$loading.show({
-        container: this.$refs.header,
-      })
-      const optin = this.$route.params.optin
-      this.$apollo
-        .query({
-          query: checkEmailQuery,
-          variables: {
-            optin: optin,
-          },
-        })
-        .then((result) => {
-          this.authenticated = true
-          this.sessionId = result.data.checkEmail.sessionId
-          this.email = result.data.checkEmail.email
-          this.$router.push('/thx/checkEmail')
-        })
-        .catch((error) => {
-          this.$toasted.error(error.message)
-        })
-      loader.hide()
-      this.pending = false
-    },
-  },
-  mounted() {
-    this.authenticate()
-  },
-}
-</script>
-<style></style>