diff --git a/src/_components/shared/Input.vue b/src/_components/shared/Input.vue
index 41bed69..3445b28 100644
--- a/src/_components/shared/Input.vue
+++ b/src/_components/shared/Input.vue
@@ -2,6 +2,7 @@
 <template>
   <input
     v-bind="$attrs"
+    v-on="nativeEvents"
     v-model="content"
     @input="handleInput()"
     class="form-input"
@@ -18,6 +19,7 @@ export default {
       default: '',
     },
   },
+
   data() {
     return {
       content: this.value,
@@ -28,6 +30,13 @@ export default {
       this.content = v;
     },
   },
+  computed: {
+    nativeEvents() {
+      return Object.keys(this.$listeners)
+        .filter((e) => e !== 'input')
+        .reduce((obj, v) => ({ ...obj, [v]: this.$listeners[v] }), {});
+    },
+  },
   methods: {
     handleInput(e) {
       this.$emit('input', this.content);
diff --git a/src/_pages/auth/Login.vue b/src/_pages/auth/Login.vue
index ea18ed1..2ec9166 100644
--- a/src/_pages/auth/Login.vue
+++ b/src/_pages/auth/Login.vue
@@ -48,6 +48,7 @@
             'is-invalid': submitted && errors.has('password'),
           }"
           v-model="password"
+          @keyup.enter="submit"
           :placeholder="messages.field_label_enter_password"
         />
         <div
@@ -65,6 +66,7 @@
             'is-invalid': submitted && errors.has('totpToken'),
           }"
           v-model="totpToken"
+          @keyup.enter="submit"
           :placeholder="messages.field_label_totp_code"
         />
         <div
@@ -177,6 +179,7 @@ export default {
     ...mapActions('account', ['login', 'logout']),
 
     submit() {
+      console.log('submit');
       this.errors.clear();
       this.$v.$touch();
       this.submitted = true;