Affiliate auto associate new orgs with disambiguated orgs