diff --git a/code/espurna/config/general.h b/code/espurna/config/general.h
index 0a9d7af6..2d38f2cb 100644
--- a/code/espurna/config/general.h
+++ b/code/espurna/config/general.h
@@ -337,6 +337,8 @@ PROGMEM const char* const custom_reset_string[] = {
 #define MQTT_AUTOCONNECT        1           // If enabled and MDNS_SUPPORT=1 will perform an autodiscover and
                                             // autoconnect to the first MQTT broker found if none defined
 #define MQTT_SERVER             ""          // Default MQTT broker address
+#define MQTT_USER               ""          // Default MQTT broker usename
+#define MQTT_PASS               ""          // Default MQTT broker password
 #define MQTT_PORT               1883        // MQTT broker port
 #define MQTT_TOPIC              "/test/switch/{identifier}"     // Default MQTT base topic
 #define MQTT_RETAIN             true        // MQTT retain flag
diff --git a/code/espurna/mqtt.ino b/code/espurna/mqtt.ino
index 153b4afe..6c903a4c 100644
--- a/code/espurna/mqtt.ino
+++ b/code/espurna/mqtt.ino
@@ -340,8 +340,8 @@ void mqttConnect() {
         char * host = strdup(getSetting("mqttServer", MQTT_SERVER).c_str());
         if (strlen(host) == 0) return;
         unsigned int port = getSetting("mqttPort", MQTT_PORT).toInt();
-        _mqttUser = strdup(getSetting("mqttUser").c_str());
-        _mqttPass = strdup(getSetting("mqttPassword").c_str());
+        _mqttUser = strdup(getSetting("mqttUser", MQTT_USER).c_str());
+        _mqttPass = strdup(getSetting("mqttPassword", MQTT_PASSWORD).c_str());
         if (_mqttWill) free(_mqttWill);
         _mqttWill = strdup((_mqttTopic + MQTT_TOPIC_STATUS).c_str());