From bd9076b7401aed73b1810e746fbb1aed30ba8649 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Tue, 7 Oct 2025 06:14:35 -0500
Subject: [PATCH] Remove risky change

---
 src/modules/NodeInfoModule.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/NodeInfoModule.cpp b/src/modules/NodeInfoModule.cpp
index 9b94b3933..aaab019d6 100644
--- a/src/modules/NodeInfoModule.cpp
+++ b/src/modules/NodeInfoModule.cpp
@@ -113,8 +113,12 @@ meshtastic_MeshPacket *NodeInfoModule::allocReply()
             u.public_key.size = 0;
         }
 
-        // Clear the user.id field since it should be derived from node number on the receiving end
-        u.id[0] = '\0';
+        // FIXME: Clear the user.id field since it should be derived from node number on the receiving end
+        // u.id[0] = '\0';
+
+        // Ensure our user.id is derived correctly
+        strcpy(u.id, nodeDB->getNodeId().c_str());
+
         LOG_INFO("Send owner %s/%s/%s", u.id, u.long_name, u.short_name);
         lastSentToMesh = millis();
         return allocDataProtobuf(u);