diff --git a/meshuser.js b/meshuser.js
index 990ada07..5812de82 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -2858,8 +2858,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
                         if (rights == 0) return;
 
                         // Add an event for this device
-                        var targets = ['*', 'server-users', user._id, nodes[0].meshid];
-                        var event = { etype: 'node', userid: user._id, username: user.name, nodeid: nodes[0]._id, action: 'manual', msg: decodeURIComponent(command.msg), domain: domain.id };
+                        var targets = ['*', 'server-users', user._id, node.meshid];
+                        var event = { etype: 'node', userid: user._id, username: user.name, nodeid: node._id, action: 'manual', msg: decodeURIComponent(command.msg), domain: domain.id };
                         parent.parent.DispatchEvent(targets, obj, event);
                     });
                     break;
diff --git a/package.json b/package.json
index c2c97a71..edc06ee9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "0.4.7-o",
+  "version": "0.4.7-p",
   "keywords": [
     "Remote Management",
     "Intel AMT",