Fix: better optout for market

small enhancement for marketplace's first optout