Fix logic
Merge branch 'optout_mailchimp'