Added `client_id` config setting