[Fixes #84509774]handle password resets better