Fix account discovery, use regular subscription channel