diff --git a/authority/static/dialog/main.js b/authority/static/dialog/main.js
index e6d2498663a097a7fbdbc37f74ac97bb0c031d58..a9718c8ef815f8ed011f3750a93bfc544ffb6d06 100644
--- a/authority/static/dialog/main.js
+++ b/authority/static/dialog/main.js
@@ -393,5 +393,11 @@
     }
   });
 
-  runAuthenticateDialog();
+  // 'Enter' in any input field triggers a click on the submit button
+  $('input').keypress(function(e){
+    if(e.which == 13) {
+      $('#submit').click();
+      e.preventDefault();
+    }
+  });
 })();