PLF-6115 Fix the usage of OrganizationService