updates to better support client id disabling