change clientID only if it's set