diff --git a/frontend/src/components/Login.vue b/frontend/src/components/Login.vue
index 5163652..bf8ecf7 100644
--- a/frontend/src/components/Login.vue
+++ b/frontend/src/components/Login.vue
@@ -7,22 +7,21 @@
             Login
           </div>
         </h2>
-        <form class="ui large form" id="loginform">
+        <form class="ui large form" id="loginform" @submit.prevent="submit">
           <div class="ui stacked segment">
             <div class="field">
               <div class="ui left icon input">
                 <i class="user icon"></i>
-                <input v-focus type="text" name="username" placeholder="Username" v-model="credentials.username">
+                <input v-focus type="text" name="username" placeholder="Username" v-model="credentials.username" required>
               </div>
             </div>
             <div class="field">
               <div class="ui left icon input">
                 <i class="lock icon"></i>
-                <input type="password" name="password" placeholder="Password" v-model="credentials.password"
-                       @keyup.enter="submit">
+                <input type="password" name="password" placeholder="Password" v-model="credentials.password" required>
               </div>
             </div>
-            <div class="ui fluid large blue submit button" @click="submit()">Login</div>
+            <button type="submit" class="ui fluid large blue submit button">Login</button>
           </div>
 
           <div class="ui info message" v-if="loading">