diff --git a/include/class.client.php b/include/class.client.php
index 4badbc789b3a527e43d7d4cecbe5143d77cb56a6..2af67879f6944db3526e4480c99e7eee06a2e08f 100644
--- a/include/class.client.php
+++ b/include/class.client.php
@@ -358,7 +358,7 @@ class ClientAccount extends UserAccount {
         if ($vars['passwd1']) {
             $this->set('passwd', Passwd::hash($vars['passwd1']));
             $info = array('password' => $vars['passwd1']);
-            Signal::send('auth.pwchange', $this, $info);
+            Signal::send('auth.pwchange', $this->getUser(), $info);
             $this->cancelResetTokens();
             $this->clearStatus(UserAccountStatus::REQUIRE_PASSWD_RESET);
         }
diff --git a/include/class.user.php b/include/class.user.php
index 37137177d1823c319aba4f24ef293505a843f06a..6145e09e0834ca8d81114fc77a1c109256cdeea7 100644
--- a/include/class.user.php
+++ b/include/class.user.php
@@ -761,7 +761,7 @@ class UserAccount extends UserAccountModel {
         $this->set('username', $vars['username']);
 
         if ($vars['passwd1']) {
-            $this->set('passwd', Passwd::hash($vars['passwd']));
+            $this->set('passwd', Passwd::hash($vars['passwd1']));
             $this->setStatus(UserAccountStatus::CONFIRMED);
         }