diff --git a/src/octoprint/static/js/app/viewmodels/loginstate.js b/src/octoprint/static/js/app/viewmodels/loginstate.js
index 05766fd0..5b12fa77 100644
--- a/src/octoprint/static/js/app/viewmodels/loginstate.js
+++ b/src/octoprint/static/js/app/viewmodels/loginstate.js
@@ -99,13 +99,19 @@ $(function() {
                 });
         };
 
-        self.prepareLogin = function(data, event, extra) {
-            if (event.type === "submit" || (event.type === "keyup" && event.keyCode == 13)) {
+        self.prepareLogin = function(data, event) {
+            if(event && event.preventDefault) {
                 event.preventDefault();
-                self.login();
             }
+            self.login();
         };
 
+        self.onKeyUp = function(data, event) {
+            if (event && event.keyCode == 13) {
+                $('#loginForm').submit();
+            }
+        }
+
         self.onAllBound = function(allViewModels) {
             self.allViewModels = allViewModels;
         };
diff --git a/src/octoprint/templates/navbar/login.jinja2 b/src/octoprint/templates/navbar/login.jinja2
index fa70fa17..a071cf9c 100644
--- a/src/octoprint/templates/navbar/login.jinja2
+++ b/src/octoprint/templates/navbar/login.jinja2
@@ -5,9 +5,9 @@
 <div id="login_dropdown_loggedout" style="padding: 15px" class="dropdown-menu" data-bind="css: {hide: loginState.loggedIn(), 'dropdown-menu': !loginState.loggedIn()}">
     <form id="loginForm" data-bind="event: {'submit': loginState.prepareLogin }" autocomplete="on">
         <label for="login_user">{{ _('Username') }}</label>
-        <input type="text" id="login_user" name="username" data-bind="valueWithInit: loginState.loginUser, event: {'keyup': loginState.prepareLogin }" placeholder="{{ _('Username') }}" autocapitalize="none" autocomplete="on">
+        <input type="text" id="login_user" name="username" data-bind="valueWithInit: loginState.loginUser, event: {'keyup': loginState.onKeyUp }" placeholder="{{ _('Username') }}" autocapitalize="none" autocomplete="on">
         <label for="login_pass">{{ _('Password') }}</label>
-        <input type="password" id="login_pass" name="password" data-bind="valueWithInit: loginState.loginPass, event: {'keyup': loginState.prepareLogin }" placeholder="{{ _('Password') }}" autocomplete="on">
+        <input type="password" id="login_pass" name="password" data-bind="valueWithInit: loginState.loginPass, event: {'keyup': loginState.onKeyUp }" placeholder="{{ _('Password') }}" autocomplete="on">
         <label class="checkbox">
             <input type="checkbox" id="login_remember" data-bind="checked: loginState.loginRemember"> {{ _('Remember me') }}
         </label>