Something is broken with password-resetting

Building a test to reproduce the issue (already hitting the first problem). 
Will do further testing and fixes in this branch.