diff --git a/agents/MeshCmd-signed.exe b/agents/MeshCmd-signed.exe
index 026f5257..9bce7ba7 100644
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
diff --git a/agents/MeshCmd64-signed.exe b/agents/MeshCmd64-signed.exe
index a13f50f9..367d6640 100644
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
diff --git a/agents/MeshService-signed.exe b/agents/MeshService-signed.exe
index 59546bf3..1a454f5c 100644
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
diff --git a/agents/MeshService.exe b/agents/MeshService.exe
index 54ccf1d3..f894ae0e 100644
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
diff --git a/agents/MeshService64-signed.exe b/agents/MeshService64-signed.exe
index 0f36b783..96499881 100644
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
diff --git a/agents/MeshService64.exe b/agents/MeshService64.exe
index ee84e2f1..b632a2e3 100644
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
diff --git a/meshcentral.js b/meshcentral.js
index 64420da2..7ff44573 100644
--- a/meshcentral.js
+++ b/meshcentral.js
@@ -393,10 +393,12 @@ function CreateMeshCentralServer(config, args) {
                                 var existingUser = users[newobj._id];
                                 if (existingUser) {
                                     // Merge the links
-                                    for (var j in newobj.links) {
-                                        if ((existingUser.links == null) || (existingUser.links[j] == null)) {
-                                            if (existingUser.links == null) { existingUser.links = {}; }
-                                            existingUser.links[j] = newobj.links[j];
+                                    if (typeof newobj.links == 'object') {
+                                        for (var j in newobj.links) {
+                                            if ((existingUser.links == null) || (existingUser.links[j] == null)) {
+                                                if (existingUser.links == null) { existingUser.links = {}; }
+                                                existingUser.links[j] = newobj.links[j];
+                                            }
                                         }
                                     }
                                     if (existingUser.name == 'admin') { existingUser.links = {}; }