diff --git a/server/server.js b/server/server.js
index 728e1d9b..7d6ee42b 100644
--- a/server/server.js
+++ b/server/server.js
@@ -721,6 +721,7 @@ try {
                 bean.pushToken = monitor.pushToken;
                 bean.proxyId = Number.isInteger(monitor.proxyId) ? monitor.proxyId : null;
                 bean.mqttUsername = monitor.mqttUsername;
+                bean.mqttPassword = monitor.mqttPassword;
                 bean.mqttTopic = monitor.mqttTopic;
                 bean.mqttSuccessMessage = monitor.mqttSuccessMessage;
 
diff --git a/server/util-server.js b/server/util-server.js
index a9ec89e6..7a9d3e7d 100644
--- a/server/util-server.js
+++ b/server/util-server.js
@@ -135,10 +135,10 @@ exports.mqttAsync = function (hostname, topic, okMessage, options = {}) {
             if (messageTopic == topic) {
                 client.end();
                 clearTimeout(timeoutID);
-                if (message.toString() === okMessage) {
-                    resolve(`Topic: ${messageTopic}; Message: ${message.toString()}`);
+                if (okMessage != null && okMessage !== "" && message.toString() !== okMessage) {
+                    reject(new Error(`Message Mismatch - Topic: ${messageTopic}; Message: ${message.toString()}`));
                 } else {
-                    reject(new Error(`Error; Topic: ${messageTopic}; Message: ${message.toString()}`));
+                    resolve(`Topic: ${messageTopic}; Message: ${message.toString()}`);
                 }
             }
         });
diff --git a/src/pages/EditMonitor.vue b/src/pages/EditMonitor.vue
index 405ed5f8..9615ce6a 100644
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@@ -141,7 +141,7 @@
 
                                 <div class="my-3">
                                     <label for="mqttSuccessMessage" class="form-label">MQTT {{ $t("successMessage") }}</label>
-                                    <input id="mqttSuccessMessage" v-model="monitor.mqttSuccessMessage" type="text" class="form-control" required>
+                                    <input id="mqttSuccessMessage" v-model="monitor.mqttSuccessMessage" type="text" class="form-control">
                                     <div class="form-text">
                                         {{ $t("successMessageExplanation") }}
                                     </div>