Fix bug where we were mistakenly resetting unsubscribe tokens