diff --git a/gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua b/gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
index 906d926..afcc83f 100644
--- a/gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
+++ b/gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
@@ -52,9 +52,7 @@ function action_reboot()
     pubkey = configmode.get_fastd_pubkey(meshvpn_name)
   end
 
-  uci:foreach("gluon-config-mode", "wizard", function(s)
-      uci:set("gluon-config-mode", s[".name"], "configured", "1")
-    end)
+  uci:set("gluon-config-mode", uci:get_first("gluon-config-mode", "wizard"), "configured", "1")
   uci:save("gluon-config-mode")
   uci:commit("gluon-config-mode")
 
diff --git a/gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua b/gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
index a11c8f7..45a741d 100644
--- a/gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
+++ b/gluon/gluon-config-mode/files/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
@@ -97,17 +97,14 @@ function f.handle(self, state, data)
     uci:save("fastd")
     uci:commit("fastd")
 
-    uci:foreach("system", "system", function(s)
-            uci:set("system", s[".name"], "hostname", data._hostname)
-            end)
+    uci:set("system", uci:get_first("system", "system"), "hostname", data._hostname)
     uci:save("system")
     uci:commit("system")
 
-    uci:foreach("gluon-node-info", "location", function(s)
-            uci:set("gluon-node-info", s[".name"], "share_location", data._location)
-            uci:set("gluon-node-info", s[".name"], "latitude", data._latitude)
-            uci:set("gluon-node-info", s[".name"], "longitude", data._longitude)
-            end)
+    local sname = uci:get_first("gluon-node-info", "location")
+    uci:set("gluon-node-info", sname, "share_location", data._location)
+    uci:set("gluon-node-info", sname, "latitude", data._latitude)
+    uci:set("gluon-node-info", sname, "longitude", data._longitude)
     uci:save("gluon-node-info")
     uci:commit("gluon-node-info")