Add correct user_id to subscriptions
Make OneAPI sub/unsub delivery status work