feature #5893 change OrganisationControllerFactory