diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts
index 9856e1968..bebc32e1e 100644
--- a/backend/src/graphql/resolver/UserResolver.ts
+++ b/backend/src/graphql/resolver/UserResolver.ts
@@ -199,7 +199,6 @@ export class UserResolver {
       throw new Error('No user with this credentials')
     })
     if (!loginUser.emailChecked) {
-      // TODO we want to catch this on the frontend and ask the user to check his emails or resend code
       throw new Error('User email not validated')
     }
     if (loginUser.password === BigInt(0)) {
diff --git a/frontend/src/views/Pages/Login.vue b/frontend/src/views/Pages/Login.vue
index 5f86b1600..0ce209551 100755
--- a/frontend/src/views/Pages/Login.vue
+++ b/frontend/src/views/Pages/Login.vue
@@ -105,7 +105,7 @@ export default {
           loader.hide()
         })
         .catch((error) => {
-          if (!error.message.includes('User email not validated')) {
+          if (error.message.includes('No user with this credentials')) {
             this.$toasted.error(this.$t('error.no-account'))
           } else {
             // : this.$t('error.no-email-verify')