changes for email issue