Fix the smtp issue