fix null email issue during oauth