diff --git a/views/login-mobile.handlebars b/views/login-mobile.handlebars
index 24f80c62..fc38a02e 100644
--- a/views/login-mobile.handlebars
+++ b/views/login-mobile.handlebars
@@ -63,11 +63,11 @@
                                     <table>
                                         <tr>
                                             <td id=loginusername align=right width=100>Username:</td>
-                                            <td><input id=username type=text autocomplete="username" maxlength=64 name=username required /></td>
+                                            <td><input id=username type=text autocomplete="username" maxlength=64 name=username required onchange=validateLogin(1) onkeyup=validateLogin(1,event)  /></td>
                                         </tr>
                                         <tr>
                                             <td align=right>Password:</td>
-                                            <td><input id=password type=password autocomplete="current-password" maxlength=256 name=password autocomplete=off required /></td>
+                                            <td><input id=password type=password autocomplete="current-password" maxlength=256 name=password autocomplete=off required onchange=validateLogin(2) onkeyup=validateLogin(2,event)  /></td>
                                         </tr>
                                         <tr>
                                             <td><div id=showPassHintLink style=display:none><a onclick=showPassHint() style="cursor:pointer">Show Hint</a></div></td>
@@ -572,6 +572,15 @@
             }
         }
 
+        function validateLogin(box, e) {
+            setTimeout(function(){
+                setDialogMode(0);
+                if ((e != null) && (e.keyCode == 13)) { if (box == 1) { Q('password').focus(); } else if (box == 2) { Q('loginButton').click(); } }
+                if (e != null) { haltEvent(e); }
+            }, 100);
+        }
+
+
         function validateCreate(box,e) {
             setDialogMode(0);
             var ok = false;
diff --git a/views/login.handlebars b/views/login.handlebars
index edbda542..2e8458f6 100644
--- a/views/login.handlebars
+++ b/views/login.handlebars
@@ -55,11 +55,11 @@
                                     <table>
                                         <tr>
                                             <td id=loginusername align=right width=100>Username:</td>
-                                            <td><input id=username {{{autocomplete}}}="username" type=text maxlength=64 name=username required /></td>
+                                            <td><input id=username {{{autocomplete}}}="username" type=text maxlength=64 name=username required onchange=validateLogin(1) onkeyup=validateLogin(1,event)  /></td>
                                         </tr>
                                         <tr>
                                             <td align=right>Password:</td>
-                                            <td><input id=password {{{autocomplete}}}="current-password" type=password maxlength=256 name=password required /></td>
+                                            <td><input id=password {{{autocomplete}}}="current-password" type=password maxlength=256 name=password required onchange=validateLogin(2) onkeyup=validateLogin(2,event)  /></td>
                                         </tr>
                                         <tr>
                                             <td><div id=showPassHintLink style=display:none><a onclick="return showPassHint(event);" href="#" style="cursor:pointer">Show Hint</a></div></td>
@@ -660,6 +660,14 @@
             }
         }
 
+        function validateLogin(box, e) {
+            setTimeout(function(){
+                setDialogMode(0);
+                if ((e != null) && (e.keyCode == 13)) { if ((box == 1) && (Q('username').value != '')) { Q('password').focus(); } else if ((box == 2) && (Q('password').value != '')) { Q('loginButton').click(); } }
+                if (e != null) { haltEvent(e); }
+            }, 100);
+        }
+
         function validateCreate(box, e) {
             setDialogMode(0);
             var userok = false;
diff --git a/views/login2.handlebars b/views/login2.handlebars
index 8c6bdc32..a83c1c50 100644
--- a/views/login2.handlebars
+++ b/views/login2.handlebars
@@ -69,12 +69,12 @@
                             <table style="width:100%">
                                 <tr>
                                     <td>
-                                        <input id=username title="Username" style="box-sizing:border-box;width:280px;border:0;border-radius:4px;padding:8px;background-color:#FFF8CC" {{{autocomplete}}}="username" placeholder="Username" type=text maxlength=64 name=username required />
+                                        <input id=username title="Username" style="box-sizing:border-box;width:280px;border:0;border-radius:4px;padding:8px;background-color:#FFF8CC" {{{autocomplete}}}="username" placeholder="Username" type=text maxlength=64 name=username required onchange=validateLogin(1) onkeyup=validateLogin(1,event) />
                                     </td>
                                 </tr>
                                 <tr>
                                     <td>
-                                        <input id=password title="Password" style="box-sizing:border-box;width:280px;border:0;border-radius:4px;padding:8px;background-color:#FFF8CC" {{{autocomplete}}}="current-password" placeholder="Password" type=password maxlength=256 name=password required />
+                                        <input id=password title="Password" style="box-sizing:border-box;width:280px;border:0;border-radius:4px;padding:8px;background-color:#FFF8CC" {{{autocomplete}}}="current-password" placeholder="Password" type=password maxlength=256 name=password required onchange=validateLogin(2) onkeyup=validateLogin(2,event) />
                                     </td>
                                 </tr>
                                 <tr>
@@ -771,6 +771,17 @@
             if (!formSubmitted) { formSubmitted = true; document.getElementById(v).submit(); }
         }
 
+        function validateLogin(box, e) {
+            setTimeout(function(){
+                setDialogMode(0);
+                if ((e != null) && (e.keyCode == 13)) {
+                    if ((box == 1) && (Q('username').value != '')) { Q('password').focus(); }
+                    else if ((box == 2) && (Q('password').value != '')) { Q('loginButton').click(); }
+                }
+                if (e != null) { haltEvent(e); }
+            }, 100);
+        }
+
         function validateCreate(box, e) {
             setDialogMode(0);
             var userok = false;