WIKI-969 Fix the usage of OrganizationService