diff --git a/src/octoprint/static/js/app/viewmodels/loginstate.js b/src/octoprint/static/js/app/viewmodels/loginstate.js
index 5b12fa77..10a2d4a4 100644
--- a/src/octoprint/static/js/app/viewmodels/loginstate.js
+++ b/src/octoprint/static/js/app/viewmodels/loginstate.js
@@ -106,12 +106,6 @@ $(function() {
             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 a071cf9c..a9045ba4 100644
--- a/src/octoprint/templates/navbar/login.jinja2
+++ b/src/octoprint/templates/navbar/login.jinja2
@@ -3,11 +3,11 @@
     <b class="caret"></b>
 </a>
 <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">
+    <form id="loginForm" data-bind="event: {'submit': loginState.prepareLogin }">
         <label for="login_user">{{ _('Username') }}</label>
-        <input type="text" id="login_user" name="username" data-bind="valueWithInit: loginState.loginUser, event: {'keyup': loginState.onKeyUp }" placeholder="{{ _('Username') }}" autocapitalize="none" autocomplete="on">
+        <input type="text" id="login_user" name="username" data-bind="valueWithInit: loginState.loginUser" placeholder="{{ _('Username') }}" autocapitalize="none">
         <label for="login_pass">{{ _('Password') }}</label>
-        <input type="password" id="login_pass" name="password" data-bind="valueWithInit: loginState.loginPass, event: {'keyup': loginState.onKeyUp }" placeholder="{{ _('Password') }}" autocomplete="on">
+        <input type="password" id="login_pass" name="password" data-bind="valueWithInit: loginState.loginPass" placeholder="{{ _('Password') }}">
         <label class="checkbox">
             <input type="checkbox" id="login_remember" data-bind="checked: loginState.loginRemember"> {{ _('Remember me') }}
         </label>