Populate the stream id from server side rather than rely on client side ...

...context