1 files changed, 9 insertions, 1 deletions
diff --git a/js/codeq/login.js b/js/codeq/login.js
index 6f9a7e7..7db2c8c 100644
--- a/js/codeq/login.js
+++ b/js/codeq/login.js
@@ -33,11 +33,18 @@
                     $('#disabled').css('display', 'none');
                 })
                 .done();
-        };
+        },
+        formInputs = $('#username').add('#password');
+
     codeq.globalStateMachine.register('login',{
         'enter': function(){
             $('#signed-in-title').html('');
             $("#submit").on('click', loginFun);
+            formInputs.on('keyup', function (ev) {
+                if ((ev.keyCode || ev.which) == 13) {
+                    $('#submit').trigger('click');
+                }
+            });
             $('#modalLogIn').modal();
 
             $("#screen_login").css('display', '');
@@ -45,6 +52,7 @@
         },
         'exit' : function(){
             $("#submit").off('click', loginFun);
+            formInputs.off('keyup');
             $("#screen_login").css('display', 'none');
             $('#signed-in-title').html('Signed in as '+$('#username').val());
             $("#password").val('');