diff --git a/docker/mosquitto.conf b/docker/mosquitto.conf
index eb26ac02..eac096c4 100644
--- a/docker/mosquitto.conf
+++ b/docker/mosquitto.conf
@@ -7,5 +7,4 @@ listener 1883
 protocol websockets
 allow_anonymous false
 
-allow_anonymous false
 password_file /mosquitto/password.txt
diff --git a/docker/wait.sh b/docker/wait.sh
index f5d19f22..bf98768f 100755
--- a/docker/wait.sh
+++ b/docker/wait.sh
@@ -1,8 +1,8 @@
 #!/bin/ash
 
 encrypt_password() {
-  echo "${MQ_USERNAME}:${MQ_PASSWORD}" > /mosquitto/passwords.txt
-  mosquitto_passwd -U /mosquitto/passwords.txt
+  echo "${MQ_USERNAME}:${MQ_PASSWORD}" > /mosquitto/password.txt
+  mosquitto_passwd -U /mosquitto/password.txt
 }
 
 main(){
diff --git a/scripts/nm-quick-interactive.sh b/scripts/nm-quick-interactive.sh
index 7f992080..baa9e875 100644
--- a/scripts/nm-quick-interactive.sh
+++ b/scripts/nm-quick-interactive.sh
@@ -297,6 +297,7 @@ select domain_option in "Auto Generated Password" "Input Your Own Password"; do
             echo "wrong password entered, try again..."
             continue
         fi
+		MQ_PASSWORD="$GET_MQ_PASSWORD"
         echo "MQ Password Saved Successfully!!"
         break
     done