change userstream handling