diff --git a/libs/notifications/mqtt.js b/libs/notifications/mqtt.js
index 5cc803af..c68d616c 100644
--- a/libs/notifications/mqtt.js
+++ b/libs/notifications/mqtt.js
@@ -8,12 +8,20 @@ module.exports = function(s,config,lang,getSnapshot){
         } = require('../events/utils.js')(s,config,lang)
         try{
             function createMqttSubscription(options){
-                const mqttEndpoint = options.host
+                let mqttEndpoint = options.host
+                const username = options.username || ''
+                const password = options.password || ''
                 const subKey = options.subKey
                 const groupKey = options.ke
                 const onData = options.onData || function(){}
+                if(mqttEndpoint.indexOf('://') === -1){
+                    mqttEndpoint = `mqtt://${mqttEndpoint}`
+                }
                 s.debugLog('Connecting.... mqtt://' + mqttEndpoint)
-                const client  = mqtt.connect('mqtt://' + mqttEndpoint)
+                const client  = mqtt.connect('mqtt://' + mqttEndpoint,{
+                    username: username,
+                    password: password,
+                })
                 client.on('connect', function () {
                     s.debugLog('Connected! mqtt://' + mqttEndpoint)
                     client.subscribe(subKey, function (err) {
diff --git a/web/assets/js/bs5.mqttOut.js b/web/assets/js/bs5.mqttOut.js
index 9ab567d9..c5d5d6d5 100644
--- a/web/assets/js/bs5.mqttOut.js
+++ b/web/assets/js/bs5.mqttOut.js
@@ -58,6 +58,10 @@ $(document).ready(function(){
                 <input placeholder="${lang.Example} : mqtt.server.host" class="form-control form-control-sm mb-2" mqtt-param="host" value="${row.host || ''}">
                 <input placeholder="${lang.Example} : your/events" class="form-control form-control-sm" mqtt-param="pubKey" value="${row.pubKey || ''}">
             </div>
+            <div class="px-1 py-2">
+                <input placeholder="${lang.Username}" class="form-control form-control-sm mb-2" mqtt-param="username" value="${row.username || ''}">
+                <input placeholder="${lang.Password}" class="form-control form-control-sm" mqtt-param="password" value="${row.password || ''}">
+            </div>
             <div class="px-1 py-2">
                 <select multiple class="form-control form-control-sm" mqtt-param="msgFor">
                     ${selecteEventsHtml}