diff --git a/browserid/static/dialog/controllers/authenticate_controller.js b/browserid/static/dialog/controllers/authenticate_controller.js
index db5b30d9d1cd64f979bb083e13cab90819899c0f..9b45226a8bd7edd48804a6b57e1219e4e187cf1b 100644
--- a/browserid/static/dialog/controllers/authenticate_controller.js
+++ b/browserid/static/dialog/controllers/authenticate_controller.js
@@ -168,6 +168,10 @@
     },
 
     resetPassword: function() {
+      var email = $("#email").val();
+      this.close("reset_password", {
+        email: email
+      });
     }
   });
 
diff --git a/browserid/static/dialog/controllers/dialog_controller.js b/browserid/static/dialog/controllers/dialog_controller.js
index 052befa737d94c916d0802e0fc85cf323cbc0ac1..2a5d2191fc0da155063568029ec387dc7f666ebe 100644
--- a/browserid/static/dialog/controllers/dialog_controller.js
+++ b/browserid/static/dialog/controllers/dialog_controller.js
@@ -88,12 +88,8 @@ PageController.extend("Dialog", {}, {
         self.syncEmailKeypairs();
       });
 
-      hub.subscribe("forgotpassword", function(msg, info) {
-        self.doForgotPassword(info.email);
-      });
-
-      hub.subscribe("forgotpassword:reset", function(msg, info) {
-        self.doConfirmEmail(info.email);
+      hub.subscribe("reset_password", function(msg, info) {
+        self.doConfirmUser(info.email);
       });
 
       hub.subscribe("email_chosen", function(msg, info) {