diff --git a/nymea-app/configuredhostsmodel.cpp b/nymea-app/configuredhostsmodel.cpp
index 11877c7a..27b2f005 100644
--- a/nymea-app/configuredhostsmodel.cpp
+++ b/nymea-app/configuredhostsmodel.cpp
@@ -158,6 +158,9 @@ void ConfiguredHostsModel::addHost(ConfiguredHost *host)
         QModelIndex idx = index(m_list.indexOf(host));
         emit dataChanged(idx, idx, {RoleName});
     });
+    connect(host, &ConfiguredHost::uuidChanged, this, [=](){
+        saveToDisk();
+    });
     m_list.append(host);
     endInsertRows();
     emit countChanged();
diff --git a/nymea-app/ui/RootItem.qml b/nymea-app/ui/RootItem.qml
index 6734cb84..c887ce1f 100644
--- a/nymea-app/ui/RootItem.qml
+++ b/nymea-app/ui/RootItem.qml
@@ -295,7 +295,7 @@ Item {
                             popup.open();
                         }
                         onConnectedChanged: {
-                            print("json client connected changed", engine.jsonRpcClient.connected)
+                            print("json client connected changed", engine.jsonRpcClient.connected, engine.jsonRpcClient.serverUuid)
                             if (engine.jsonRpcClient.connected) {
                                 nymeaDiscovery.cacheHost(engine.jsonRpcClient.currentHost)
                                 configuredHost.uuid = engine.jsonRpcClient.serverUuid