diff --git a/apps/frontend/src/views/Login.vue b/apps/frontend/src/views/Login.vue
index 880a23bd27..bd1de4cc74 100644
--- a/apps/frontend/src/views/Login.vue
+++ b/apps/frontend/src/views/Login.vue
@@ -22,10 +22,12 @@
                     prepend-icon="mdi-account"
                     type="text"
                     required
+                    @keyup.enter="$refs.password.focus"
                     @blur="$v.email.$touch()"
                   />
                   <v-text-field
                     id="password_field"
+                    ref="password"
                     v-model="password"
                     :error-messages="passwordErrors"
                     name="password"
@@ -34,6 +36,7 @@
                     :type="showPassword ? 'text' : 'password'"
                     :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
                     @click:append="showPassword = !showPassword"
+                    @keyup.enter="login"
                     @blur="$v.password.$touch()"
                   />
                   <v-btn
diff --git a/apps/frontend/src/views/Signup.vue b/apps/frontend/src/views/Signup.vue
index f4d14a6b6f..15044ad332 100644
--- a/apps/frontend/src/views/Signup.vue
+++ b/apps/frontend/src/views/Signup.vue
@@ -21,11 +21,13 @@
                     label="Email"
                     prepend-icon="mdi-account"
                     type="text"
+                    @keyup.enter="$refs.password.focus"
                     @blur="$v.email.$touch()"
                   />
                   <br />
                   <v-text-field
                     id="password"
+                    ref="password"
                     v-model="password"
                     :error-messages="passwordErrors"
                     prepend-icon="mdi-lock"
@@ -34,6 +36,7 @@
                     :type="showPassword ? 'text' : 'password'"
                     :append-icon="showPassword ? 'mdi-eye' : 'mdi-eye-off'"
                     loading
+                    @keyup.enter="$refs.passwordConfirmation.focus"
                     @click:append="showPassword = !showPassword"
                     @blur="$v.password.$touch()"
                   >
@@ -49,12 +52,14 @@
                   <br />
                   <v-text-field
                     id="passwordConfirmation"
+                    ref="passwordConfirmation"
                     v-model="passwordConfirmation"
                     name="passwordConfirmation"
                     :error-messages="passwordConfirmationErrors"
                     label="Confirm Password"
                     prepend-icon="mdi-lock-alert"
                     type="password"
+                    @keyup.enter="register"
                     @blur="$v.passwordConfirmation.$touch()"
                   />
                   <br />