diff --git a/CHANGLELOG.md b/CHANGLELOG.md
index b3443032..d2d1728f 100644
--- a/CHANGLELOG.md
+++ b/CHANGLELOG.md
@@ -7,14 +7,14 @@
 ### Objects
 <!-- ? Support for State and Part properties -->
 - `action` and `swipe` can now be set to any command
-- Set default line_width of new `line` objects to 1
+- Set default `line_width` of new `line` objects to 1
 - Allow line and block comments in pages.jsonl
 - HASP theme: Toggle objects now use the secondary color when they are in the toggled state.
 
 ### Fonts
 - Firmware files include the bitmapped font sizes 12, 16, 24 and 32pt
 - Use embedded TrueType font for other font sizes (PSram highly recommended)
-- Add glyphs from character sets Cyrillic, Latin-2, Greek and Viernamese to default fonts
+- Add glyphs from Cyrillic, Latin-2, Greek and Viernamese character sets to default fonts
 
 ### Web UI
 - Update Web UI to petite-vue app
@@ -48,7 +48,7 @@
 - Add support for ESP32-S3 devices
 - Deprication of support for ESP32-S2 devices due to lack of sRAM
 
-Updated libraries to ArduinoJson 6.20.1, ArduinoStreamUtils 1.7.0, TFT_eSPI 2.5.0, LovyanGFX 1.1.2 and SimpleFTPServer 2.1.5
+Updated libraries to ArduinoJson 6.21.0, ArduinoStreamUtils 1.7.0, TFT_eSPI 2.5.0, LovyanGFX 1.1.2 and SimpleFTPServer 2.1.5
 
 
 ## v0.6.3
diff --git a/platformio.ini b/platformio.ini
index c0e1fc50..fde2e754 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -75,14 +75,14 @@ build_flags =
     -D HASP_VER_MAJ=0
     -D HASP_VER_MIN=7
     ;-D HASP_VER_REV=4
-    -D HASP_VER_REV=0-rc1
+    -D HASP_VER_REV=0-rc2
     ;-D HASP_VER_REV=4-rc1
     ${override.build_flags}
 
 ; -- Shared library dependencies in all environments
 ; Warning : don't put comments after github links => causes infinite download loop
 lib_deps =
-    bblanchon/ArduinoJson@^6.20.1
+    bblanchon/ArduinoJson@^6.21.0
     ;git+https://github.com/fvanroie/ConsoleInput.git
     ;git+https://github.com/andrethomas/TasmotaSlave.git
     ;git+https://github.com/lvgl/lvgl.git
diff --git a/src/mqtt/hasp_mqtt_paho_single.cpp b/src/mqtt/hasp_mqtt_paho_single.cpp
index 78d2e6ce..e0de3932 100644
--- a/src/mqtt/hasp_mqtt_paho_single.cpp
+++ b/src/mqtt/hasp_mqtt_paho_single.cpp
@@ -234,7 +234,8 @@ int mqtt_send_state(const __FlashStringHelper* subtopic, const char* payload)
 int mqtt_send_discovery(const char* payload, size_t len)
 {
     char tmp_topic[128];
-    snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR(MQTT_PREFIX "/" MQTT_TOPIC_DISCOVERY "/%s"),haspDevice.get_hardware_id());
+    snprintf_P(tmp_topic, sizeof(tmp_topic), PSTR(MQTT_PREFIX "/" MQTT_TOPIC_DISCOVERY "/%s"),
+               haspDevice.get_hardware_id());
     return mqttPublish(tmp_topic, payload, len, false);
 }
 
@@ -423,9 +424,11 @@ bool mqttSetConfig(const JsonObject& settings)
     // configOutput(settings, TAG_MQTT);
     bool changed = false;
 
-    // changed |= configSet(mqttPort, settings[FPSTR(FP_CONFIG_PORT)], F("mqttPort"));
-    changed |= mqttPort != settings[FPSTR(FP_CONFIG_PORT)];
-    mqttPort = settings[FPSTR(FP_CONFIG_PORT)];
+    if(!settings[FPSTR(FP_CONFIG_PORT)].isNull()) {
+        // changed |= configSet(mqttPort, settings[FPSTR(FP_CONFIG_PORT)], F("mqttPort"));
+        changed |= mqttPort != settings[FPSTR(FP_CONFIG_PORT)];
+        mqttPort = settings[FPSTR(FP_CONFIG_PORT)];
+    }
 
     if(!settings[FPSTR(FP_CONFIG_NAME)].isNull()) {
         LOG_VERBOSE(TAG_MQTT, "%s => %s", FP_CONFIG_NAME, settings[FPSTR(FP_CONFIG_NAME)].as<const char*>());
diff --git a/user_setups/darwin_sdl/darwin_sdl_64bits.ini b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
index 14a46dbb..9a759be2 100644
--- a/user_setups/darwin_sdl/darwin_sdl_64bits.ini
+++ b/user_setups/darwin_sdl/darwin_sdl_64bits.ini
@@ -67,7 +67,7 @@ lib_deps =
   ; lv_drivers@~7.9.1
   ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
   https://github.com/eclipse/paho.mqtt.c.git
-  bblanchon/ArduinoJson@^6.19.4    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.21.0    ; Json(l) parser
   https://github.com/fvanroie/lv_drivers
   git+https://github.com/lvgl/lv_lib_png.git#release/v7
 
diff --git a/user_setups/linux_sdl/linux_sdl_64bits.ini b/user_setups/linux_sdl/linux_sdl_64bits.ini
index 8b33d534..c77fe0f8 100644
--- a/user_setups/linux_sdl/linux_sdl_64bits.ini
+++ b/user_setups/linux_sdl/linux_sdl_64bits.ini
@@ -62,7 +62,7 @@ lib_deps =
   ;lv_drivers@~7.9.0
   ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
   https://github.com/eclipse/paho.mqtt.c.git
-  bblanchon/ArduinoJson@^6.19.4    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.21.0    ; Json(l) parser
   https://github.com/fvanroie/lv_drivers
 
 lib_ignore =
diff --git a/user_setups/win32/windows_sdl_64bits.ini b/user_setups/win32/windows_sdl_64bits.ini
index 2cf43ca8..8ce5b5a5 100644
--- a/user_setups/win32/windows_sdl_64bits.ini
+++ b/user_setups/win32/windows_sdl_64bits.ini
@@ -93,7 +93,7 @@ lib_deps =
   ;lv_drivers@~7.9.0
   ;lv_drivers=https://github.com/littlevgl/lv_drivers/archive/7d71907c1d6b02797d066f50984b866e080ebeed.zip
   https://github.com/eclipse/paho.mqtt.c.git
-  bblanchon/ArduinoJson@^6.19.4    ; Json(l) parser
+  bblanchon/ArduinoJson@^6.21.0    ; Json(l) parser
   https://github.com/fvanroie/lv_drivers
 
 lib_ignore =