diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index 85f3ca38f..64c38f449 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -80,13 +80,39 @@ describe('Register', () => {
         expect(wrapper.find('button[type="submit"]').exists()).toBe(false)
       })
 
-      it('shows a warning when no valid Email is entered', async () => {
+      it('displays a message that Email is required', async () => {
+        await wrapper.find('form').trigger('submit')
+        await flushPromises()
+        expect(wrapper.findAll('div.invalid-feedback').at(0).text()).toBe(
+          'validations.messages.required',
+        )
+      })
+
+      it('displays a message that password is required', async () => {
+        await wrapper.find('form').trigger('submit')
+        await flushPromises()
+        expect(wrapper.findAll('div.invalid-feedback').at(1).text()).toBe(
+          'validations.messages.required',
+        )
+      })
+
+      it('displays a message that passwordConfirm is required', async () => {
+        await wrapper.find('form').trigger('submit')
+        await flushPromises()
+        expect(wrapper.findAll('div.invalid-feedback').at(2).text()).toBe(
+          'validations.messages.required',
+        )
+      })
+
+      /**
+       * it('shows a warning when no valid Email is entered', async () => {
         wrapper.find('#registerEmail').setValue('no_valid@Email')
         await flushPromises()
         await expect(wrapper.find('#registerEmailLiveFeedback').text()).toEqual(
           'validations.messages.email',
         )
       })
+      */
 
       it('shows 4 warnings when no password is set', async () => {
         const passwords = wrapper.findAll('input[type="password"]')
diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue
index 6f3e3af12..1e5600008 100755
--- a/frontend/src/views/Pages/Register.vue
+++ b/frontend/src/views/Pages/Register.vue
@@ -79,8 +79,8 @@
                   <input-email v-model="form.email" id="registerEmail"></input-email>
 
                   <hr />
-                  <input-password v-model="form.password" id="registerPassword"></input-password>
-                  <input-password-confirmation v-model="form.passwordRepeat" id="registerPasswordRepeat"></input-password-confirmation>
+                  <input-password v-model="form.password" id="registerPassword" />
+                  <input-password v-model="form.passwordRepeat" id="registerPasswordRepeat" />
 
                   <transition name="hint" appear>
                     <div v-if="passwordValidation.errors.length > 0 && !submitted" class="hints">
@@ -154,10 +154,9 @@
 import loginAPI from '../../apis/loginAPI'
 import InputEmail from '../../components/Inputs/InputEmail.vue'
 import InputPassword from '../../components/Inputs/InputPassword.vue'
-import InputPasswordConfirmation from '../../components/Inputs/InputPasswordConfirmation.vue'
 
 export default {
-  components: { InputPassword, InputPasswordConfirmation, InputEmail },
+  components: { InputPassword, InputEmail },
   name: 'register',
   data() {
     return {