diff --git a/Makefile b/Makefile
index 6ea1a4d4..9311428d 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ run:
 		-e SA_TAG=1.0 \
 		-e SA_TAG2=2.0 \
 		-e SA_KILL=3.0 \
-		-e SASL_PASSWD=testing \
+		-e SASL_PASSWORD=testing \
 		-h mail.my-domain.com -t $(NAME)
 	sleep 15
 	docker run -d --name mail_pop3 \
diff --git a/start-mailserver.sh b/start-mailserver.sh
index 08cb4b25..70ce9b81 100644
--- a/start-mailserver.sh
+++ b/start-mailserver.sh
@@ -211,15 +211,15 @@ else
   echo "'/tmp/postfix/main.cf' not provided. No extra postfix settings loaded."
 fi
 
-if [ ! -z "$SASL_PASSWD" ]; then
-  echo "$SASL_PASSWD" > /etc/postfix/sasl_passwd
+if [ ! -z "$SASL_PASSWORD" ]; then
+  echo "$SASL_PASSWORD" > /etc/postfix/sasl_passwd
   postmap hash:/etc/postfix/sasl_passwd
   rm /etc/postfix/sasl_passwd
   chown root:root /etc/postfix/sasl_passwd.db
   chmod 0600 /etc/postfix/sasl_passwd.db
   echo "Loaded SASL_PASSWORD"
 else
-  echo "==> Warning: 'SASL_PASSWORD' is not provided. /etc/postfix/sasl_passwd not created."
+  echo "Info: SASL_PASSWORD is not provided. /etc/postfix/sasl_passwd not created."
 fi
 
 echo "Fixing permissions"