diff --git a/include/Configuration.h b/include/Configuration.h
index c2fc6d3c..7db930a5 100644
--- a/include/Configuration.h
+++ b/include/Configuration.h
@@ -15,8 +15,8 @@
 #define NTP_MAX_TIMEZONEDESCR_STRLEN 50
 
 #define MQTT_MAX_HOSTNAME_STRLEN 128
-#define MQTT_MAX_USERNAME_STRLEN 32
-#define MQTT_MAX_PASSWORD_STRLEN 32
+#define MQTT_MAX_USERNAME_STRLEN 64
+#define MQTT_MAX_PASSWORD_STRLEN 64
 #define MQTT_MAX_TOPIC_STRLEN 32
 #define MQTT_MAX_LWTVALUE_STRLEN 20
 #define MQTT_MAX_ROOT_CA_CERT_STRLEN 2048
diff --git a/webapp/src/views/MqttAdminView.vue b/webapp/src/views/MqttAdminView.vue
index b2f62d96..76941294 100644
--- a/webapp/src/views/MqttAdminView.vue
+++ b/webapp/src/views/MqttAdminView.vue
@@ -55,7 +55,7 @@
                     <div class="row mb-3">
                         <label for="inputUsername" class="col-sm-2 col-form-label">Username:</label>
                         <div class="col-sm-10">
-                            <input type="text" class="form-control" id="inputUsername" maxlength="32"
+                            <input type="text" class="form-control" id="inputUsername" maxlength="64"
                                 placeholder="Username, leave empty for anonymous connection"
                                 v-model="mqttConfigList.mqtt_username" />
                         </div>
@@ -64,7 +64,7 @@
                     <div class="row mb-3">
                         <label for="inputPassword" class="col-sm-2 col-form-label">Password:</label>
                         <div class="col-sm-10">
-                            <input type="password" class="form-control" id="inputPassword" maxlength="32"
+                            <input type="password" class="form-control" id="inputPassword" maxlength="64"
                                 placeholder="Password, leave empty for anonymous connection"
                                 v-model="mqttConfigList.mqtt_password" />
                         </div>