Moving client setting into the config setter