diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 5bf71bad1..4c8ad8cbe 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -67,6 +67,8 @@
procedure to a fatal error, since this will lead to a false url in the asset
table. (mkamerbeek/Procolix)
- fix [ 1249114 ] unclosed
elements in auth modules (mkamerbeek/Procolix)
+ - fix [ 1249117 ] resetExpiredPassword not a callable method from authmodules.
+ Includes an additional bugfix in resetExpiredPasswordSave method (mkamerbeek/Procolix)
6.6.5
- fix [ 1243131 ] In 6.6.4 you cannot upload anything (ebruni/mwilson)
diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm
index a356b9df5..5b1d60510 100644
--- a/lib/WebGUI/Auth/WebGUI.pm
+++ b/lib/WebGUI/Auth/WebGUI.pm
@@ -487,7 +487,7 @@ sub new {
my $class = shift;
my $authMethod = $_[0];
my $userId = $_[1];
- my @callable = ('validateEmail','createAccount','deactivateAccount','displayAccount','displayLogin','login','logout','recoverPassword','resetExpiredPasswordSave','recoverPasswordFinish','createAccountSave','deactivateAccountConfirm','resetExpiredPasswordSave','updateAccount');
+ my @callable = ('validateEmail','createAccount','deactivateAccount','displayAccount','displayLogin','login','logout','recoverPassword','resetExpiredPassword','recoverPasswordFinish','createAccountSave','deactivateAccountConfirm','resetExpiredPasswordSave','updateAccount');
my $self = WebGUI::Auth->new($authMethod,$userId,\@callable);
bless $self, $class;
}
@@ -582,7 +582,7 @@ sub resetExpiredPasswordSave {
$u = WebGUI::User->new($session{form}{uid});
$session{form}{username} = $u->username;
- $error .= $self->error if(!$self->authenticate($session{form}{oldPassword}));
+ $error .= $self->error if(!$self->authenticate($u->username,$session{form}{oldPassword}));
$error .= ''.WebGUI::International::get(5,'AuthWebGUI').'' if($session{form}{identifier} eq "password");
$error .= ''.WebGUI::International::get(12,'AuthWebGUI').'' if ($session{form}{oldPassword} eq $session{form}{identifier});
$error .= $self->error if(!$self->_isValidPassword($session{form}{identifier},$session{form}{identifierConfirm}));