diff --git a/html/js/login.js b/html/js/login.js
index 57658e5..0d3a6bd 100644
--- a/html/js/login.js
+++ b/html/js/login.js
@@ -6,12 +6,5 @@ function processLogin() {
     window.location.replace(jsconfig.baseurl + "/app/");
 };
 
-function addClickToLogin() {
-    $("#loginButton").click(processLogin);
-};
-
 // If the login page is displayed, we need to remvoe any existing auth tokens
 window.localStorage.removeItem("authtoken");
-
-// Set the click function for the login button
-$(document).ready(addClickToLogin);
diff --git a/html/login.html b/html/login.html
index 52ab9da..4714c9b 100644
--- a/html/login.html
+++ b/html/login.html
@@ -18,18 +18,20 @@
             <div class="four columns offset-by-four"><h3 style="text-align: center">Login</h3></div>
         </div>
     </div>
-    <div class="container">
-        <div class="row">
-            <div class="two columns offset-by-two" style="text-align: right">Username:</div>
-            <div class="four columns"><input type="text" style="width: 100%" id="loginName" /></div>
+    <form onsubmit="processLogin(); return false;">
+        <div class="container">
+            <div class="row">
+                <div class="two columns offset-by-two" style="text-align: right">Username:</div>
+                <div class="four columns"><input type="text" style="width: 100%" id="loginName" /></div>
+            </div>
+            <div class="row">
+                <div class="two columns offset-by-two" style="text-align: right">Password:</div>
+                <div class="four columns"><input type="password" style="width: 100%" id="loginPassword" /></div>
+            </div>
+            <div class="row">
+                <div class="four columns offset-by-four"><button type="submit" id="loginButton" style="width: 100%" class="button button-primary">Login</button></div>
+            </div>
         </div>
-        <div class="row">
-            <div class="two columns offset-by-two" style="text-align: right">Password:</div>
-            <div class="four columns"><input type="password" style="width: 100%" id="loginPassword" /></div>
-        </div>
-        <div class="row">
-            <div class="four columns offset-by-four"><button type="submit" id="loginButton" style="width: 100%" class="button button-primary">Login</button></div>
-        </div>
-    </div>
+    </form>
 </body>
 </html>