Explicitly feature flag email opt-in, add tests of new behavior