diff --git a/run.sh b/run.sh
index aa1ff7d..e274251 100644
--- a/run.sh
+++ b/run.sh
@@ -46,5 +46,26 @@ if [ ! -f /etc/postfix/sasl_passwd ]; then
   fi
 fi
 
+#Set header tag
+postconf -e "header_checks = regexp:/etc/postfix/header_tag"
+if [ -z "${HEADER_TAG}" ]; then
+TAG="$RANDOM"
+else
+TAG="${HEADER_TAG}"
+fi
+echo -e "/^MIME-Version:/i PREPEND RelayTag: $TAG\n/^Content-Transfer-Encoding:/i PREPEND RelayTag: $TAG" > /etc/postfix/header_tag
+echo "******** Header tag is $TAG *********"
+
+# Create sasl_passwd file with auth credentials
+if [ ! -f /etc/postfix/sasl_passwd ]; then
+  grep -q "${SMTP_SERVER}" /etc/postfix/sasl_passwd  > /dev/null 2>&1
+  if [ $? -gt 0 ]; then
+    echo "Adding SASL authentication configuration"
+    echo "[${SMTP_SERVER}]:${SMTP_PORT} ${SMTP_USERNAME}:${SMTP_PASSWORD}" >> /etc/postfix/sasl_passwd
+    postmap /etc/postfix/sasl_passwd
+  fi
+fi
+
+
 #Start services
 supervisord