INTEG-374 Fix the usage of OrganizationService