CDB-2891 Fix: organization owner association was (still) broken