diff --git a/include/mqtt_config.h b/include/mqtt_config.h
index 7daec77..a8dcf68 100644
--- a/include/mqtt_config.h
+++ b/include/mqtt_config.h
@@ -12,9 +12,9 @@
 #define MQTT_MAX_HOST_LEN           64
 #define MQTT_MAX_CLIENT_LEN         32
 #define MQTT_MAX_USERNAME_LEN       32
-#define MQTT_MAX_PASSWORD_LEN       32
+#define MQTT_MAX_PASSWORD_LEN       64
 #define MQTT_MAX_LWT_TOPIC          32
-#define MQTT_MAX_LWT_MSG            32
+#define MQTT_MAX_LWT_MSG            128
 #define MQTT_TASK_PRIORITY          5
 #define MQTT_TASK_STACK             (6*1024)
 #define MQTT_KEEPALIVE_TICK         (120)