diff --git a/browserid/static/dialog/controllers/dialog_controller.js b/browserid/static/dialog/controllers/dialog_controller.js
index 3fb64c5414b6ec6421544c4e6a1915af66181f50..f77f16ad313c982254eb20fb8f42a5cad5440cbe 100644
--- a/browserid/static/dialog/controllers/dialog_controller.js
+++ b/browserid/static/dialog/controllers/dialog_controller.js
@@ -15,14 +15,24 @@ $.Controller("Dialog", {}, {
},
+<<<<<<< Updated upstream
// this is not working yet
"input keyup": function(e){
if(e.which == 13) {
$('.submit').click();
e.preventDefault();
}
+=======
+ setupEnterKey: function() {
+ $("input").keyup(function(e) {
+ if(e.which == 13) {
+ $('.submit').click();
+ e.preventDefault();
+ }
+ });
+>>>>>>> Stashed changes
},
-
+
"#signin click": function(event) {
var email = $("#email_input").val();
var pass = $("#password_input").val();
diff --git a/browserid/static/prove.html b/browserid/static/prove.html
index 16de868b6877ebe310dbb03b9827adc354c487b9..2cbd2a94aa1bf709fd39171037706065b755163c 100644
--- a/browserid/static/prove.html
+++ b/browserid/static/prove.html
@@ -5,7 +5,7 @@
<title>BrowserID - My Account</title>
<link rel="stylesheet" href="css/style.css" type="text/css">
</head>
-<body onload="display_saved_ids()">
+<body>
<div id="splash">
<div class="topquarter">
<div>
@@ -37,7 +37,7 @@
</div>
</div>
</body>
-<script src="dialog/jquery-min.js"></script>
+<script src="js/jquery-1.6.2.min.js"></script>
<script>
function getParameterByName( name )
{