Manually resolved conflict after recent pull.

1 files changed, 1 insertions, 1 deletions

diff --git a/modules/user/controllers/users.php b/modules/user/controllers/users.php
index 0f880fa9..bfa9d720 100644
--- a/modules/user/controllers/users.php
+++ b/modules/user/controllers/users.php
@@ -198,7 +198,7 @@ class Users_Controller extends Controller {
       ->error_messages("length", t("Your email address is too long"))
       ->error_messages("required", t("You must enter a valid email address"));
 
-    module::event("user_change_password_form", $user, $form);
+    module::event("user_change_email_form", $user, $form);
     $group->submit("")->value(t("Save"));
     return $form;
   }