Added more flags for customer emails