CLC-4322 Fix persistence logic for opt-in/out

https://jira.ets.berkeley.edu/jira/browse/CLC-4322

This will also need a QA patch, which I'll open after this is merged to master.