Fixed some problems with the password reset feature