Issue/pwreset again

Fixup a few authentication-related issues, including password resets