diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 08cd11ec..a55b31e3 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -19,6 +19,7 @@
 							type="text"
 							autocomplete="username"
 							v-focus
+							@keyup.enter="submit"
 						/>
 					</div>
 				</div>
@@ -34,6 +35,7 @@
 							required
 							type="password"
 							autocomplete="current-password"
+							@keyup.enter="submit"
 						/>
 					</div>
 				</div>
@@ -48,6 +50,7 @@
 							required
 							type="text"
 							v-focus
+							@keyup.enter="submit"
 						/>
 					</div>
 				</div>
diff --git a/src/views/user/Register.vue b/src/views/user/Register.vue
index 5d200a2a..81521c7f 100644
--- a/src/views/user/Register.vue
+++ b/src/views/user/Register.vue
@@ -15,7 +15,9 @@
 							type="text"
 							autocomplete="username"
 							v-focus
-							v-model="credentials.username"/>
+							v-model="credentials.username"
+							@keyup.enter="submit"
+						/>
 					</div>
 				</div>
 				<div class="field">
@@ -28,7 +30,9 @@
 							placeholder="e.g. frederic@vikunja.io"
 							required
 							type="email"
-							v-model="credentials.email"/>
+							v-model="credentials.email"
+							@keyup.enter="submit"
+						/>
 					</div>
 				</div>
 				<div class="field">
@@ -42,7 +46,9 @@
 							required
 							type="password"
 							autocomplete="new-password"
-							v-model="credentials.password"/>
+							v-model="credentials.password"
+							@keyup.enter="submit"
+						/>
 					</div>
 				</div>
 				<div class="field">
@@ -56,7 +62,9 @@
 							required
 							type="password"
 							autocomplete="new-password"
-							v-model="credentials.password2"/>
+							v-model="credentials.password2"
+							@keyup.enter="submit"
+						/>
 					</div>
 				</div>