Client id disambiguation