ECMS-6488 Fix the usage of OrganizationService