Merge pull request from p2pu/2021-optout-fix Update opt-out to require a user action after visiting the link