diff --git a/src/components/login/login.ts b/src/components/login/login.ts
index dcab806..cadae63 100644
--- a/src/components/login/login.ts
+++ b/src/components/login/login.ts
@@ -4,6 +4,7 @@ import {HttpUtils} from '@/utils/http-utils';
 
 /**
  * This component handles user login, and obtains data from the server.
+ * TODO: Press enter to login
  */
 @Component({
     components: {},
@@ -70,4 +71,12 @@ export default class Login extends Vue
             this.loading = false;
         });
     }
+
+    /**
+     * This is called when the user hits enter in the input boxes.
+     */
+    public onEnter()
+    {
+        this.onLoginClick();
+    }
 }
diff --git a/src/components/login/login.vue b/src/components/login/login.vue
index bd52eae..6a03b1d 100644
--- a/src/components/login/login.vue
+++ b/src/components/login/login.vue
@@ -8,13 +8,15 @@
 
                 <el-input v-model="username"
                           placeholder="School Username"
-                          :class="{'input-error': error !== ''}">
+                          :class="{'input-error': error !== ''}"
+                          @keyup.enter.native="onEnter">
                 </el-input>
 
                 <el-input v-model="password"
                           placeholder="Veracross Password"
                           show-password=""
-                          :class="{'input-error': error !== ''}">
+                          :class="{'input-error': error !== ''}"
+                          @keyup.enter.native="onEnter">
                 </el-input>
 
                 <div class="el-form-item__error custom">{{error}}</div>