Migrate to 2 clicks for more privacy