diff --git a/2020.09/apache/setup_msmtp.sh b/2020.09/apache/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2020.09/apache/setup_msmtp.sh
+++ b/2020.09/apache/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2020.09/fpm-alpine/setup_msmtp.sh b/2020.09/fpm-alpine/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2020.09/fpm-alpine/setup_msmtp.sh
+++ b/2020.09/fpm-alpine/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2020.09/fpm/setup_msmtp.sh b/2020.09/fpm/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2020.09/fpm/setup_msmtp.sh
+++ b/2020.09/fpm/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2021.01/apache/setup_msmtp.sh b/2021.01/apache/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2021.01/apache/setup_msmtp.sh
+++ b/2021.01/apache/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2021.01/fpm-alpine/setup_msmtp.sh b/2021.01/fpm-alpine/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2021.01/fpm-alpine/setup_msmtp.sh
+++ b/2021.01/fpm-alpine/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2021.01/fpm/setup_msmtp.sh b/2021.01/fpm/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2021.01/fpm/setup_msmtp.sh
+++ b/2021.01/fpm/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2021.03-dev/apache/setup_msmtp.sh b/2021.03-dev/apache/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2021.03-dev/apache/setup_msmtp.sh
+++ b/2021.03-dev/apache/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2021.03-dev/fpm-alpine/setup_msmtp.sh b/2021.03-dev/fpm-alpine/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2021.03-dev/fpm-alpine/setup_msmtp.sh
+++ b/2021.03-dev/fpm-alpine/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2021.03-dev/fpm/setup_msmtp.sh b/2021.03-dev/fpm/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2021.03-dev/fpm/setup_msmtp.sh
+++ b/2021.03-dev/fpm/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2021.03-rc/apache/setup_msmtp.sh b/2021.03-rc/apache/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2021.03-rc/apache/setup_msmtp.sh
+++ b/2021.03-rc/apache/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2021.03-rc/fpm-alpine/setup_msmtp.sh b/2021.03-rc/fpm-alpine/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2021.03-rc/fpm-alpine/setup_msmtp.sh
+++ b/2021.03-rc/fpm-alpine/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/2021.03-rc/fpm/setup_msmtp.sh b/2021.03-rc/fpm/setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/2021.03-rc/fpm/setup_msmtp.sh
+++ b/2021.03-rc/fpm/setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"
diff --git a/docker-setup_msmtp.sh b/docker-setup_msmtp.sh
index b2e22f0..b90c42c 100644
--- a/docker-setup_msmtp.sh
+++ b/docker-setup_msmtp.sh
@@ -6,6 +6,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
   echo "Setup MSMTP for '$SITENAME' with '$SMTP' ..."
 
   smtp_from="${SMTP_FROM:=no-reply}"
+  smtp_auth="${SMTP_AUTH:=on}"
 
   # Setup MSMTP
   usermod --comment "$(echo "$SITENAME" | tr -dc '[:print:]')" root
@@ -26,7 +27,7 @@ if [ -n "${SMTP_DOMAIN+x}" ] && [ -n "${SMTP+x}" ] && [ "${SMTP}" != "localhost"
     echo "tls_certcheck off" # No certcheck because of internal docker mail-hostnames
     if [ -n "${SMTP_TLS+x}" ]; then echo "tls on"; fi
     if [ -n "${SMTP_STARTTLS+x}" ]; then echo "tls_starttls on"; fi
-    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth on"; fi
+    if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "auth $smtp_auth"; fi
     if [ -n "${SMTP_AUTH_USER+x}" ]; then echo "user \"$SMTP_AUTH_USER\""; fi
     if [ -n "${SMTP_AUTH_PASS+x}" ]; then echo "password \"$SMTP_AUTH_PASS\""; fi
     echo "logfile /var/log/msmtp.log"