-Changed to only remove password reset session flag if the password reset actually works.
Merge pull request #1164 from mmcguinn/mm1157

-Changed to only remove password reset session flag if the password reset actually works.