diff --git a/Chart.yaml b/Chart.yaml
index b742142..6a4a81d 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 name: plausible-analytics
 description: A Helm Chart for Plausible Analytics - Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics.
 type: application
-version: 0.2.1
+version: 0.2.2
 appVersion: 2.0.0
 keywords:
   - web analytics
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index 603f539..92a3644 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -133,6 +133,7 @@ spec:
             - name: SMTP_HOST_PORT
               value: {{ .Values.mailer.smtp.port | toString | quote }}
             {{- end }}
+            {{- if .Values.mailer.smtp.auth }}
             {{- if .Values.mailer.smtp.username }}
             - name: SMTP_USER_NAME
               value: {{ .Values.mailer.smtp.username | toString | quote }}
@@ -142,6 +143,7 @@ spec:
                 secretKeyRef:
                   key: SMTP_USER_PWD
                   name: {{ include "plausible-analytics.secretName" . }}
+            {{- end }}
             {{- if .Values.mailer.smtp.ssl }}
             - name: SMTP_HOST_SSL_ENABLED
               value: {{ .Values.mailer.smtp.ssl | toString | quote }}
diff --git a/values.yaml b/values.yaml
index d22f9ba..1c5795a 100644
--- a/values.yaml
+++ b/values.yaml
@@ -46,9 +46,10 @@ mailer:
   smtp:
     host: ""  # The host address of your smtp server.
     port: ""  # The port of your smtp server.
+    auth: false  # If SMTP auth is enabled.
     username: ""  # The username/email in case SMTP auth is enabled.
     password: ""  # The password in case SMTP auth is enabled.
-    ssl: ""  # If SSL is enabled for SMTP connection
+    ssl: false  # If SSL is enabled for SMTP connection
     retries: ""  # Number of retries to make until mailer gives up.
   mailgun:
     apiKey: ""