diff --git a/README.md b/README.md
index 2c35703..4a3eb8b 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,7 @@ Passbolt docker image provides several environment variables to configure differ
 * EMAIL_HOST:      server hostname                ( defaults to localhost)
 * EMAIL_PORT:      server port                    ( defaults to 587)
 * EMAIL_TIMEOUT:   timeout                        ( defaults to 30s)
+* EMAIL_AUTH:      disable smtp auth              ( defaults to true)
 * EMAIL_USERNAME:  username for email server auth ( defaults to email_user)
 * EMAIL_PASSWORD:  password for email server auth ( defaults to email_password)
 * EMAIL_TLS:       set tls, boolean               ( defaults to false)
diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index d0725a3..0a52c03 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -106,6 +106,7 @@ email_setup() {
   # EMAIL_HOST
   # EMAIL_PORT
   # EMAIL_TIMEOUT
+  # EMAIL_AUTH
   # EMAIL_USERNAME
   # EMAIL_PASSWORD
   # EMAIL_TLS
@@ -124,8 +125,14 @@ email_setup() {
   sed -i s:$default_host:${EMAIL_HOST:-localhost}:g $email_config
   sed -i s:$default_port:${EMAIL_PORT:-587}:g $email_config
   sed -i s:$default_timeout:${EMAIL_TIMEOUT:-30}:g $email_config
-  sed -i "0,/"$default_username"/s:"$default_username":'${EMAIL_USERNAME:-email_user}':" $email_config
-  sed -i "0,/"$default_password"/s:"$default_password":'${EMAIL_PASSWORD:-email_password}':" $email_config
+  if [ "$EMAIL_AUTH" = "false" ] ; then
+	sed -i "0,/"$default_username"/s:"$default_username":null:" $email_config
+	sed -i "0,/"$default_password"/s:"$default_password":null:" $email_config
+  else
+  	sed -i "0,/"$default_username"/s:"$default_username":'${EMAIL_USERNAME:-email_user}':" $email_config
+	sed -i "0,/"$default_password"/s:"$default_password":'${EMAIL_PASSWORD:-email_password}':" $email_config
+  fi
+  
   sed -i "0,/tls/s:false:${EMAIL_TLS:-false}:" $email_config
 
 }