Improve origin_user_id integration