diff --git a/frontend/src/views/Pages/Login.spec.js b/frontend/src/views/Pages/Login.spec.js
index 34175d8b3..f9fde0e1e 100644
--- a/frontend/src/views/Pages/Login.spec.js
+++ b/frontend/src/views/Pages/Login.spec.js
@@ -251,6 +251,44 @@ describe('Login', () => {
           it('toasts an error message', () => {
             expect(toastErrorMock).toBeCalledWith('error.no-account')
           })
+
+          describe('login fails with "User email not validated"', () => {
+            beforeEach(async () => {
+              apolloQueryMock.mockRejectedValue({
+                message: 'User email not validated',
+              })
+              wrapper = Wrapper()
+              jest.clearAllMocks()
+              await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
+              await wrapper.find('input[placeholder="form.password"]').setValue('1234')
+              await flushPromises()
+              await wrapper.find('form').trigger('submit')
+              await flushPromises()
+            })
+
+            it('redirects to /thx/login', () => {
+              expect(mockRouterPush).toBeCalledWith('/thx/login')
+            })
+          })
+
+          describe('login fails with "User has no password set yet"', () => {
+            beforeEach(async () => {
+              apolloQueryMock.mockRejectedValue({
+                message: 'User has no password set yet',
+              })
+              wrapper = Wrapper()
+              jest.clearAllMocks()
+              await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
+              await wrapper.find('input[placeholder="form.password"]').setValue('1234')
+              await flushPromises()
+              await wrapper.find('form').trigger('submit')
+              await flushPromises()
+            })
+
+            it('redirects to /reset/login', () => {
+              expect(mockRouterPush).toBeCalledWith('/reset/login')
+            })
+          })
         })
       })
     })
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index d5d3e25a4..4d2b75d2a 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -105,10 +105,10 @@ export default {
           loader.hide()
         })
         .catch((error) => {
-          if (error.message.includes('No user with this credentials')) {
-            this.$toasted.global.error(this.$t('error.no-account'))
-          } else {
-            // : this.$t('error.no-email-verify')
+          this.$toasted.global.error(this.$t('error.no-account'))
+          if (error.message.includes('User email not validated')) {
+            this.$router.push('/thx/login')
+          } else if (error.message.includes('User has no password set yet')) {
             this.$router.push('/reset/login')
           }
           loader.hide()