updates for email issue