diff --git a/tools/chatgui/src/main.cpp b/tools/chatgui/src/main.cpp
index 3b40b36b..da76266a 100644
--- a/tools/chatgui/src/main.cpp
+++ b/tools/chatgui/src/main.cpp
@@ -42,11 +42,16 @@ int main(int argc, char *argv[]) {
         }
     } else {
         if (!cfg.load()) {
-            qCritical("Failed to load config: %s", qPrintable(cfgPath));
+            qCritical("Cannot open/read config file: %s", qPrintable(cfgPath));
             return 1;
         }
-        if (cfg.privKey().length() != 64 || cfg.pubKey().length() != 64 ||
-            cfg.nodeId().length() != 16) {
+        if (cfg.privKey().length() != 64 || cfg.pubKey().length() != 64) {
+            qWarning("Config: keys missing/invalid, regenerating identity");
+            cfg.generateIdentity();
+            needSave = true;
+        }
+        if (cfg.nodeId().length() != 16) {
+            qWarning("Config: my_node_id missing/invalid, regenerating identity");
             cfg.generateIdentity();
             needSave = true;
         }
diff --git a/tools/chatgui/transport/node_config.cpp b/tools/chatgui/transport/node_config.cpp
index e049006e..08d77fd4 100644
--- a/tools/chatgui/transport/node_config.cpp
+++ b/tools/chatgui/transport/node_config.cpp
@@ -134,7 +134,7 @@ bool NodeConfig::load() {
     if (!controlIp.isEmpty() && !controlPort.isEmpty())
         m_controlAddr = controlIp + ":" + controlPort;
 
-    return !m_nodeId.isEmpty();
+    return true;
 }
 
 bool NodeConfig::save() {