fix a bunch of stuff related to password reset