diff --git a/lib/apiserver/index.js b/lib/apiserver/index.js
index 4863153..c66a74e 100644
--- a/lib/apiserver/index.js
+++ b/lib/apiserver/index.js
@@ -37,8 +37,6 @@ function onIncomingSms(req, res) {
     res.end('OK');
 
     if (!req.query.number) return;
-    if (req.query.number.indexOf('+') !== 0) return;
-
     const numberWithSuffix = req.query.number.replace(/^\+/, '') + (config.number_suffix || '');
 
     partnerLastSeen.set(req.query.number, req.query.modem_imsi);
@@ -76,7 +74,11 @@ function onIncomingSms(req, res) {
     messagingService.onIncomingMessage({
         me: req.query.modem,
         partner: numberWithSuffix,
-        msg: req.query.msg
+        msg: req.query.msg,
+        origin_label: `IMSI_${req.query.modem_imsi || 'UNKNOWN'}`,
+        origin_transport: 'SMS',
+        origin_partner: req.query.number,
+        do_not_forward_to_core: req.query.number.indexOf('+') !== 0,
     })
 }
 
diff --git a/package-lock.json b/package-lock.json
index 4b9d482..e576728 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2474,7 +2474,7 @@
       "optional": true
     },
     "komodo-center-messaging-client-lib": {
-      "version": "git+http://gitlab.kodesumber.com/komodo/komodo-center-messaging-client-lib.git#279203beb983b3204ca45fa6c63aa03ccb7ccd4f",
+      "version": "git+http://gitlab.kodesumber.com/komodo/komodo-center-messaging-client-lib.git#6c3bf82a2d0529a11d82617ef4b973171c07114a",
       "from": "git+http://gitlab.kodesumber.com/komodo/komodo-center-messaging-client-lib.git",
       "requires": {
         "body-parser": "^1.19.0",