diff --git a/Controller.ino b/Controller.ino
index efa82cc0c6..d468570560 100644
--- a/Controller.ino
+++ b/Controller.ino
@@ -334,7 +334,12 @@ void MQTTConnect()
 
   for (byte x = 1; x < 3; x++)
   {
-    if (MQTTclient.connect(clientid))
+    boolean MQTTresult = false;
+    if ((Settings.ControllerUser) && (Settings.ControllerPassword))
+      MQTTresult = (MQTTclient.connect(MQTT::Connect(clientid).set_auth(Settings.ControllerUser, Settings.ControllerPassword)));
+    else
+      MQTTresult = (MQTTclient.connect(clientid));
+    if (MQTTresult)
     {
       Serial.println(F("MQTT : Connected to broker"));
       subscribeTo = Settings.MQTTsubscribe;
diff --git a/WebServer.ino b/WebServer.ino
index 59b6761a15..3babe4413c 100644
--- a/WebServer.ino
+++ b/WebServer.ino
@@ -356,12 +356,24 @@ void handle_config() {
     reply += SecuritySettings.ControllerUser;
   }
 
+  if (Settings.Protocol == PROTOCOL_DOMOTICZ_MQTT or Settings.Protocol == PROTOCOL_OPENHAB_MQTT or Settings.Protocol == PROTOCOL_PIDOME_MQTT)
+    {
+      reply += F("'><TR><TD>Broker username:<TD><input type='text' name='controlleruser' value='");
+      reply += Settings.ControllerUser;
+    }
+
   if (Settings.Protocol == PROTOCOL_NODO_TELNET or Settings.Protocol == PROTOCOL_THINGSPEAK)
   {
     reply += F("'><TR><TD>Controller Password:<TD><input type='text' name='controllerpassword' value='");
     reply += SecuritySettings.ControllerPassword;
   }
 
+  if (Settings.Protocol == PROTOCOL_DOMOTICZ_MQTT or Settings.Protocol == PROTOCOL_OPENHAB_MQTT or Settings.Protocol == PROTOCOL_PIDOME_MQTT)
+    {
+      reply += F("'><TR><TD>Broker password:<TD><input type='text' name='controllerpassword' value='");
+      reply += Settings.ControllerPassword;
+    }
+
   reply += F("'><TR><TD>Sensor Delay:<TD><input type='text' name='delay' value='");
   reply += Settings.Delay;
   reply += F("'><TR><TD>Sleep Mode:<TD>");