Use client ID of spark instead of those of spark uploader

TBR: @devoncarew