diff --git a/frontend/src/components/Message/Message.spec.js b/frontend/src/components/Message/Message.spec.js
index e1253e6c2..afbef53cd 100644
--- a/frontend/src/components/Message/Message.spec.js
+++ b/frontend/src/components/Message/Message.spec.js
@@ -37,74 +37,7 @@ describe('Message', () => {
     })
 
     it('button link redirects to /login', () => {
-      // Wolle console.log(wrapper.html())
       expect(wrapper.find('a.btn').attributes('href')).toBe('/login')
     })
   })
-
-  // Wolle: test 'code' prop and have a look if there is other important stuff uncommented below
-
-  // Wolle describe('coming from /forgot-password', () => {
-  //   beforeEach(() => {
-  //     wrapper = Wrapper(createMockObject('forgotPassword'))
-  //   })
-
-  //   it('renders the thanks text', () => {
-  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.email')
-  //   })
-
-  //   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')
-  //   })
-  // })
-
-  // describe('coming from /reset-password', () => {
-  //   beforeEach(() => {
-  //     wrapper = Wrapper(createMockObject('resetPassword'))
-  //   })
-
-  //   it('renders the thanks text', () => {
-  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.reset')
-  //   })
-
-  //   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')
-  //   })
-  // })
-
-  // describe('coming from /register', () => {
-  //   beforeEach(() => {
-  //     wrapper = Wrapper(createMockObject('register'))
-  //   })
-
-  //   it('renders the thanks text', () => {
-  //     expect(wrapper.find('p.h4').text()).toBe('site.thx.register')
-  //   })
-  // })
-
-  // 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('settings.password.reset')
-  //   })
-
-  //   it('links the redirect button to /forgot-password', () => {
-  //     expect(wrapper.find('a.btn').attributes('href')).toBe('/forgot-password')
-  //   })
-  // })
 })
diff --git a/frontend/src/components/Message/Message.vue b/frontend/src/components/Message/Message.vue
index bf83d7344..d9afbd480 100644
--- a/frontend/src/components/Message/Message.vue
+++ b/frontend/src/components/Message/Message.vue
@@ -4,9 +4,7 @@
     <div class="header py-lg-6">
       <b-container class="w-50">
         <div class="header-body text-center mb-7">
-          <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
           <p class="h1 test-message-headline">{{ headline }}</p>
-          <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
           <p class="h4 test-message-subtitle">{{ subtitle }}</p>
           <hr />
           <b-button
@@ -15,7 +13,6 @@
             :to="linkTo ? linkTo + (code ? `/${code}` : '') : null"
             @click="optionalCallback()"
           >
-            <!-- eslint-disable-next-line @intlify/vue-i18n/no-dynamic-keys-->
             {{ buttonText }}
           </b-button>
         </div>
@@ -34,7 +31,6 @@ export default {
     buttonText: { type: String, required: false, default: null },
     linkTo: { type: String, required: false, default: null },
     callback: { type: Function, required: false, default: null },
-    code: { type: String, required: false, default: null }, // Wolle: to be removed by adding it directly to the "linkTo"
   },
   methods: {
     optionalCallback() {
diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js
index e9aeed552..a7b2b5393 100644
--- a/frontend/src/pages/ForgotPassword.spec.js
+++ b/frontend/src/pages/ForgotPassword.spec.js
@@ -127,7 +127,6 @@ describe('ForgotPassword', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
 
-            // Wolle
             it.skip('click redirects to "/login"', async () => {
               // wrapper.find('.test-message-button').trigger('click')
               // await wrapper.vm.$nextTick()
@@ -159,7 +158,6 @@ describe('ForgotPassword', () => {
               expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login')
             })
 
-            // Wolle
             it.skip('click redirects to "/login"', () => {
               // expect(mockRouterPush).toBeCalledWith('/login')
             })
diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue
index 630974c52..1778c638c 100644
--- a/frontend/src/pages/ForgotPassword.vue
+++ b/frontend/src/pages/ForgotPassword.vue
@@ -37,7 +37,6 @@
       </div>
     </b-container>
     <b-container v-else class="mt--8 p-1">
-      <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
       <message
         v-if="success"
         :headline="$t('site.thx.title')"
@@ -52,7 +51,6 @@
         :buttonText="$t('login')"
         linkTo="/login"
       />
-      <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
     </b-container>
   </div>
 </template>
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 5b7ccfefe..b03f24fb2 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -252,7 +252,6 @@ describe('Login', () => {
             expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password')
           })
 
-          // Wolle
           it.skip('click redirects to "/forgot-password"', () => {
             // expect(mockRouterPush).toBeCalledWith('/thx/login')
           })
@@ -285,7 +284,6 @@ describe('Login', () => {
             )
           })
 
-          // Wolle
           it.skip('click redirects to "/reset-password/login"', () => {
             // expect(mockRouterPush).toBeCalledWith('/reset-password/login')
           })
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 935ed9eed..0bbfe6afc 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -58,14 +58,12 @@
       </b-row>
     </b-container>
     <b-container v-else class="mt--8 p-1">
-      <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
       <message
         :headline="$t('site.thx.errorTitle')"
         :subtitle="errorSubtitle"
         :buttonText="$t('settings.password.reset')"
         :linkTo="errorLinkTo"
       />
-      <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
     </b-container>
   </div>
 </template>
diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index 55ac36cb9..35ed534c2 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -228,24 +228,6 @@ describe('Register', () => {
           await flushPromises()
         })
 
-        // Wolle: remove?
-        // it('shows error message', () => {
-        //   expect(wrapper.find('span.alert-text').exists()).toBeTruthy()
-        //   expect(wrapper.find('span.alert-text').text().length !== 0).toBeTruthy()
-        //   expect(wrapper.find('span.alert-text').text()).toContain('error.error')
-        //   expect(wrapper.find('span.alert-text').text()).toContain('Ouch!')
-        // })
-
-        // it('button to dismisses error message is present', () => {
-        //   expect(wrapper.find('button.close').exists()).toBeTruthy()
-        // })
-
-        // it('dismisses error message', async () => {
-        //   await wrapper.find('button.close').trigger('click')
-        //   await flushPromises()
-        //   expect(wrapper.find('span.alert-text').exists()).not.toBeTruthy()
-        // })
-
         it('shows success title, subtitle, login button', () => {
           expect(wrapper.vm.showPageMessage).toBeTruthy()
           expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle')
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index 0a0d080aa..52053e6f7 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -179,7 +179,6 @@
       </b-row>
     </b-container>
     <b-container v-else class="mt--8 p-1">
-      <!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys-->
       <message
         v-if="success"
         :headline="$t('site.thx.title')"
@@ -192,7 +191,6 @@
         :buttonText="$t('site.register.message-button-text')"
         :callback="solveError"
       />
-      <!-- eslint-enable @intlify/vue-i18n/no-dynamic-keys-->
     </b-container>
     <!--
     <div class="text-center pt-4">
@@ -263,7 +261,6 @@ export default {
           },
         })
         .then(() => {
-          // Wolle: this.$router.push('/thx/register')
           this.showPageMessage = true
           this.success = true
         })
@@ -279,8 +276,7 @@ export default {
               this.messageError = this.$t('error.unknown-error') + error.message
               break
           }
-          // Wolle: this.toastError(this.$t('error.email-already-sent'))
-          // Wolle: shall the alert be replaced by a toaster or shall only the page message be shown?
+          this.toastError(this.messageError)
         })
     },
     // Wolle: remove this?