Some work on password reset stuff