oops: Fix client password reset by staff

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);
         }

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);
         }