Auto-subscription, part 2