diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h
index fd679691..b3bc8a2f 100644
--- a/tools/esp8266/defines.h
+++ b/tools/esp8266/defines.h
@@ -79,7 +79,8 @@ typedef enum {
 #define PWD_LEN                 64
 #define DEVNAME_LEN             16
 #define CRC_LEN                 2 // uint16_t
-#define DISCLAIMER              1
+#define DISCLAIMER_LEN          1
+#define STATIC_IP_LEN           16 // 4x uint32_t
 
 #define INV_ADDR_LEN            MAX_NUM_INVERTERS * 8                   // uint64_t
 #define INV_NAME_LEN            MAX_NUM_INVERTERS * MAX_NAME_LENGTH     // char[]
@@ -174,7 +175,7 @@ typedef struct {
 
 #define CFG_MQTT_LEN            MQTT_ADDR_LEN + 2 + MQTT_USER_LEN + MQTT_PWD_LEN +MQTT_TOPIC_LEN
 #define CFG_SYS_LEN             DEVNAME_LEN + SSID_LEN + PWD_LEN
-#define CFG_LEN                 7 + NTP_ADDR_LEN + 2 + CFG_MQTT_LEN + CFG_SUN_LEN + 4 + DISCLAIMER
+#define CFG_LEN                 PWD_LEN + 7 + DISCLAIMER_LEN + NTP_ADDR_LEN + 2 + CFG_MQTT_LEN + CFG_SUN_LEN + 4 + STATIC_IP_LEN
 
 #define ADDR_START              0
 #define ADDR_CFG_SYS            ADDR_START
diff --git a/tools/esp8266/webApi.cpp b/tools/esp8266/webApi.cpp
index 66a67b05..01584f46 100644
--- a/tools/esp8266/webApi.cpp
+++ b/tools/esp8266/webApi.cpp
@@ -314,7 +314,7 @@ void webApi::getIndex(JsonObject obj) {
     getMenu(obj.createNestedObject(F("menu")));
     getSysInfo(obj.createNestedObject(F("system")));
     getStatistics(obj.createNestedObject(F("statistics")));
-    obj["refresh_interval"] = SEND_INTERVAL;
+    obj["refresh_interval"] = mConfig->sendInterval;
 
     JsonArray inv = obj.createNestedArray(F("inverter"));
     Inverter<> *iv;
@@ -373,7 +373,7 @@ void webApi::getLive(JsonObject obj) {
     getMenu(obj.createNestedObject(F("menu")));
     getSysInfo(obj.createNestedObject(F("system")));
     JsonArray invArr = obj.createNestedArray(F("inverter"));
-    obj["refresh_interval"] = SEND_INTERVAL;
+    obj["refresh_interval"] = mConfig->sendInterval;
 
     uint8_t list[] = {FLD_UAC, FLD_IAC, FLD_PAC, FLD_F, FLD_PF, FLD_T, FLD_YT, FLD_YD, FLD_PDC, FLD_EFF, FLD_Q};