diff --git a/client/src/main/webapp/WEB-INF/login_form.vm b/client/src/main/webapp/WEB-INF/login_form.vm
index ea4d101d53..b1bf431c95 100644
--- a/client/src/main/webapp/WEB-INF/login_form.vm
+++ b/client/src/main/webapp/WEB-INF/login_form.vm
@@ -56,6 +56,7 @@
 
 
     <script type="text/javascript">
+
     
         function getParameterByName(name) {
             name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
@@ -84,6 +85,14 @@
             if (err === "true") {
                 $("#login_box_error").show();
             }
+            $("#login_form input").keypress(function (e) {
+              if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) {
+                __loginbutton();
+                return false;
+              } else {
+                 return true;
+              }
+           });
         });
 
     </script>