Recover password regression fix