diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 00dd0a2f6..ebdffe6a0 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -124,13 +124,39 @@ describe('Register', () => {
         wrapper.find('input[name="site.signup.agree"]').setChecked(true)
       })
 
-      it('resets the form data after clicking the reset button', async () => {
+      it('resets the firstName field after clicking the reset button', async () => {
         await wrapper.find('button.ml-2').trigger('click')
         await flushPromises()
         expect(wrapper.find('#registerFirstname').element.value).toBe('')
+      })
+
+      it('resets the lastName field after clicking the reset button', async () => {
+        await wrapper.find('button.ml-2').trigger('click')
+        await flushPromises()
         expect(wrapper.find('#registerLastname').element.value).toBe('')
+      })
+
+      it('resets the email field after clicking the reset button', async () => {
+        await wrapper.find('button.ml-2').trigger('click')
+        await flushPromises()
         expect(wrapper.find('#Email-input-field').element.value).toBe('')
-        // TODO: expect(wrapper.find('input[name="form.password"]').element.value).toBe('') or .toBe('Aa123456')
+      })
+
+      it('resets the password field after clicking the reset button', async () => {
+        await wrapper.find('button.ml-2').trigger('click')
+        await flushPromises()
+        expect(wrapper.find('input[name="form.password"]').element.value).toBe('')
+      })
+
+      it('resets the passwordRepeat field after clicking the reset button', async () => {
+        await wrapper.find('button.ml-2').trigger('click')
+        await flushPromises()
+        expect(wrapper.find('input[name="form.passwordRepeat"]').element.value).toBe('')
+      })
+
+      it('resets the firstName field after clicking the reset button', async () => {
+        await wrapper.find('button.ml-2').trigger('click')
+        await flushPromises()
         expect(wrapper.find('input[name="site.signup.agree"]').props.checked).not.toBeTruthy()
       })
     })
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index dd9a812d3..933cae028 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -168,6 +168,8 @@ export default {
         },
         agree: false,
       }
+      this.form.password.password = ''
+      this.form.password.passwordRepeat = ''
       this.$nextTick(() => {
         this.$refs.observer.reset()
       })
@@ -188,6 +190,7 @@ export default {
           this.form.firstname = ''
           this.form.lastname = ''
           this.form.password.password = ''
+          this.form.password.passwordRepeat = ''
           this.$router.push('/thx/register')
         })
         .catch((error) => {
@@ -202,6 +205,7 @@ export default {
       this.form.firstname = ''
       this.form.lastname = ''
       this.form.password.password = ''
+      this.form.password.passwordRepeat = ''
     },
   },
   computed: {