Save the double opt-in setting in the right file this time

Cleaned up the subscribe too