fixes #8261 - use Default Organization for certificate org