GH #102 - Use the default client_id if none is provided on input.