client id related changes