more password reset improvements