diff --git a/.templates/00-smb_mounts.sh b/.templates/00-smb_mounts.sh
index 5845ed10a..87101a224 100755
--- a/.templates/00-smb_mounts.sh
+++ b/.templates/00-smb_mounts.sh
@@ -43,7 +43,7 @@ mount_drive () {
 
         # Define options
         MOUNTED=true
-        MOUNTOPTIONS="$1"
+        MOUNTOPTIONS="rw,file_mode=0775,dir_mode=0775,username=$USERNAME,password=${PASSWORD},nobrl$SMBVERS$SECVERS$PUID$PGID$CHARSET$DOMAIN"
 
         # Try mounting
         mount -t cifs -o "$MOUNTOPTIONS" "$disk" /mnt/"$diskname" 2>ERRORCODE || MOUNTED=false
@@ -136,7 +136,7 @@ if bashio::config.has_value 'networkdisks'; then
         chown root:root /mnt/"$diskname"
 
         # Quickly try to mount with defaults
-        mount_drive "rw,file_mode=0775,dir_mode=0775,username=$USERNAME,password=${PASSWORD},nobrl$SMBVERS$SECVERS$PUID$PGID$CHARSET$DOMAIN"
+        mount_drive
         
         # Deeper analysis if failed
         if [ "$MOUNTED" = false ]; then
@@ -217,7 +217,7 @@ if bashio::config.has_value 'networkdisks'; then
             #######################################
             for SECVERS in "$SECVERS" ",sec=ntlmv2" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=krb5i" ",sec=krb5" ",sec=ntlm" ",sec=ntlmv2i"; do
                 if [ "$MOUNTED" = false ]; then
-                        mount_drive "rw,file_mode=0775,dir_mode=0775,username=$USERNAME,password=${PASSWORD},nobrl$SMBVERS$SECVERS$PUID$PGID$CHARSET$DOMAIN"
+                        mount_drive
                 fi
             done
 
@@ -226,8 +226,7 @@ if bashio::config.has_value 'networkdisks'; then
         # Messages
         if [ "$MOUNTED" = true ]; then
 
-            bashio::log.info "...... $disk successfully mounted to /mnt/$diskname with options $MOUNTOPTIONS"
-
+            bashio::log.info "...... $disk successfully mounted to /mnt/$diskname with options ${MOUNTOPTIONS/$PASSWORD/XXXXXXXXXX}"
             # Remove errorcode
             if [ -f ERRORCODE ]; then
                 rm ERRORCODE
@@ -249,7 +248,12 @@ if bashio::config.has_value 'networkdisks'; then
             smbclient -t 2 -L $disk -U "$USERNAME%$PASSWORD" -c "exit"
 
             # Error code
-            mount_drive "rw,file_mode=0775,dir_mode=0775,username=$USERNAME,password=${PASSWORD},nobrl$DOMAIN"
+            SMBVERS=""
+            SECVERS=""
+            PUID=""
+            PGID=""
+            CHARSET=""            
+            mount_drive
             bashio::log.fatal "Error read : $(<ERRORCODE), addon will stop in 1 min"
 
             # clean folder