Disconnect client id fixes.