COR-289: Fixed also the OrganizationAuthenticatorImpl