Fix change expired password feature
Fix change expired password feature

Closes-Bug: #1791111
Change-Id: I5f2a027149be490613e7661b895325a63374334d
(cherry picked from commit c0cc0433c645181a9031b99d23954ae9bece9542)

NeCTAR-RC/horizon,NeCTAR-RC/horizon,NeCTAR-RC/horizon,NeCTAR-RC/horizon