diff --git a/src/static/js/app.js b/src/static/js/app.js
index 6425322..63a9338 100644
--- a/src/static/js/app.js
+++ b/src/static/js/app.js
@@ -40,6 +40,7 @@ const App = (() => {
         <div class="login-box">
           <div class="logo">CC<span class="accent">.</span>Dashboard</div>
           <div id="login-error" class="error-msg"></div>
+          <form id="login-form" autocomplete="on" onsubmit="return false">
           <div class="form-group">
             <label>Email</label>
             <input type="email" id="login-email" placeholder="you@example.com" autocomplete="email">
@@ -48,9 +49,10 @@ const App = (() => {
             <label>Password</label>
             <input type="password" id="login-password" placeholder="••••••••" autocomplete="current-password">
           </div>
-          <button class="btn btn-primary" style="width:100%;justify-content:center;margin-top:8px" id="btn-login">
+          <button type="submit" class="btn btn-primary" style="width:100%;justify-content:center;margin-top:8px" id="btn-login">
             Sign In
           </button>
+          </form>
         </div>
       </div>
     `;
@@ -70,9 +72,7 @@ const App = (() => {
     };
 
     document.getElementById('btn-login').onclick = doLogin;
-    document.getElementById('login-password').addEventListener('keydown', e => {
-      if (e.key === 'Enter') doLogin();
-    });
+    document.getElementById('login-form').addEventListener('submit', doLogin);
   }
 
   function renderShell() {