diff --git a/src/RestApiHandler.c b/src/RestApiHandler.c
index c2f23d4..bc486fe 100644
--- a/src/RestApiHandler.c
+++ b/src/RestApiHandler.c
@@ -64,10 +64,13 @@ static void funct_wifimode(char *argres, int rw)
     switch (rw)
     {
         case 0:
-            SysConfig.wifiSettings.WiFiMode = atoi(argres);
+            *argres = '"';
+            itoa(SysConfig.wifiSettings.WiFiMode, argres+1, 10);
+            strcat(argres, "\"");
             break;
         case 1:
-            itoa(SysConfig.wifiSettings.WiFiMode, argres, 10);
+            SysConfig.wifiSettings.WiFiMode = atoi(argres);
+
             break;
     }
 }
@@ -139,7 +142,7 @@ const rest_var_t ConfigVariables[] =
 #endif
 
 #if CONFIG_WEBGUIAPP_WIFI_ENABLE
-                { 0, "wifi_mode", &funct_wifimode, VAR_FUNCT, 1, 3 },
+                { 0, "wifi_mode", &SysConfig.wifiSettings.WiFiMode, VAR_INT, 1, 3 },
                 { 0, "wifi_sta_ip", &SysConfig.wifiSettings.InfIPAddr, VAR_IPADDR, 0, 0 },
                 { 0, "wifi_sta_mask", &SysConfig.wifiSettings.InfMask, VAR_IPADDR, 0, 0 },
                 { 0, "wifi_sta_gw", &SysConfig.wifiSettings.InfGateway, VAR_IPADDR, 0, 0 },
diff --git a/src/SysComm.c b/src/SysComm.c
index 53cdd5d..f1c437c 100644
--- a/src/SysComm.c
+++ b/src/SysComm.c
@@ -31,10 +31,23 @@
  "payloadtype":1,
  "payload":{
  "applytype":1,
- "variables":[{"name":"netname","val":"DEVICE_HOSTNAME"},
- {"name":"otaurl","val":"https://iotronic.cloud/firmware/firmware.bin"},
- {"name":"ledenab","val":"0"},
- {"name":"otaint","val":"3600"}]
+ "variables":{
+ "wifi_mode":"",
+ "wifi_sta_ip":"",
+ "wifi_sta_mask":"",
+ "wifi_sta_gw":"",
+ "wifi_ap_ip":"",
+ "wifi_dns1":"",
+ "wifi_dns2":"",
+ "wifi_dns3":"",
+ "wifi_sta_ssid":"",
+ "wifi_sta_key":"",
+ "wifi_ap_ssid":"",
+ "wifi_ap_key":"",
+ "wifi_enab":"",
+ "wifi_isdhcp":"",
+ "wifi_power":""
+ }
  }},
  "signature":"6a11b872e8f766673eb82e127b6918a0dc96a42c5c9d184604f9787f3d27bcef"}