Merge "Add better logging to password reset"