More work on password reset