[Fixes #84509774]handle password resets better
Merge pull request #113 from ActivityRez/task-82778100-aaron

[Delivers #84509774]handle password resets better