Changed from simple regex match to actually check that existing org is used.