diff --git a/src/_pages/auth/Login.vue b/src/_pages/auth/Login.vue
index 9e0b35b..ea18ed1 100644
--- a/src/_pages/auth/Login.vue
+++ b/src/_pages/auth/Login.vue
@@ -22,18 +22,11 @@
         <Input
           class="form-control"
           :class="{
-            'is-invalid': submitted && emailErrors && emailErrors.length,
+            'is-invalid': submitted && errors.has('name'),
           }"
           v-model="email"
-          @input="$v.email.$touch()"
           :placeholder="messages.field_email_hint"
         />
-        <span
-          class="form-error"
-          v-if="submitted && emailErrors && emailErrors.length"
-        >
-          {{ emailErrors.join(', ') }}
-        </span>
         <div
           v-if="submitted && errors.has('account')"
           class="invalid-feedback d-block"
@@ -52,18 +45,11 @@
           class="form-control"
           type="password"
           :class="{
-            'is-invalid': submitted && passwordErrors && passwordErrors.length,
+            'is-invalid': submitted && errors.has('password'),
           }"
           v-model="password"
-          @input="$v.password.$touch()"
           :placeholder="messages.field_label_enter_password"
         />
-        <span
-          class="form-error"
-          v-if="submitted && passwordErrors && passwordErrors.length"
-        >
-          {{ passwordErrors.join(', ') }}
-        </span>
         <div
           v-if="submitted && errors.has('password')"
           class="invalid-feedback d-block"
@@ -76,18 +62,11 @@
         <Input
           class="form-control"
           :class="{
-            'is-invalid': submitted && totpErrors && totpErrors.length,
+            'is-invalid': submitted && errors.has('totpToken'),
           }"
           v-model="totpToken"
-          @input="$v.totpToken.$touch()"
           :placeholder="messages.field_label_totp_code"
         />
-        <span
-          class="form-error"
-          v-if="submitted && totpErrors && totpErrors.length"
-        >
-          {{ totpErrors.join(', ') }}
-        </span>
         <div
           v-if="submitted && errors.has('totpToken')"
           class="invalid-feedback d-block"
@@ -106,19 +85,11 @@
         <Input
           class="form-control"
           :class="{
-            'is-invalid':
-              submitted && unlockKeyErrors && unlockKeyErrors.length,
+            'is-invalid': submitted && errors.has('unlockKey'),
           }"
           v-model="unlockKey"
-          @input="$v.unlockKey.$touch()"
           :placeholder="messages.field_label_unlock_key"
         />
-        <span
-          class="form-error"
-          v-if="submitted && unlockKeyErrors && unlockKeyErrors.length"
-        >
-          {{ unlockKeyErrors.join(', ') }}
-        </span>
         <div
           v-if="submitted && errors.has('unlockKey')"
           class="invalid-feedback d-block"
@@ -200,41 +171,6 @@ export default {
       'resetPasswordMessageSent',
     ]),
     ...mapState('system', ['configs', 'messages']),
-
-    emailErrors() {
-      const errors = [];
-      if (!this.$v.email.$dirty) return errors;
-      !this.$v.email.email && errors.push(this.messages['err_email_invalid']);
-      !this.$v.email.required &&
-        errors.push(this.messages['err_email_required']);
-      return errors;
-    },
-
-    passwordErrors() {
-      const errors = [];
-      if (!this.$v.password.$dirty) return errors;
-      !this.$v.password.minLength &&
-        errors.push(this.messages['err_password_tooShort']);
-      !this.$v.password.required &&
-        errors.push(this.messages['err_password_required']);
-      return errors;
-    },
-
-    totpErrors() {
-      const errors = [];
-      if (!this.$v.totpToken.$dirty) return errors;
-      !this.$v.totpToken.required &&
-        errors.push(this.messages['err_totpToken_invalid']);
-      return errors;
-    },
-
-    unlockKeyErrors() {
-      const errors = [];
-      if (!this.$v.unlockKey.$dirty) return errors;
-      !this.$v.unlockKey.required &&
-        errors.push(this.messages['err_unlock_required']);
-      return errors;
-    },
   },
 
   methods: {