diff --git a/charts/pixelfed/templates/secret_mail.yaml b/charts/pixelfed/templates/secret_mail.yaml
index 7bd73cc..95253fc 100644
--- a/charts/pixelfed/templates/secret_mail.yaml
+++ b/charts/pixelfed/templates/secret_mail.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.externalDatabase.existingSecret }}
+{{- if not .Values.pixelfed.mail.existingSecret }}
 ---
 apiVersion: v1
 kind: Secret
@@ -7,6 +7,10 @@ metadata:
 data:
   host: {{ .Values.pixelfed.mail.host }}
   port: {{ .Values.pixelfed.mail.port }}
+  {{- if .Values.pixelfed.mail.username }}
   username: {{ .Values.pixelfed.mail.username }}
+  {{- end }}
+  {{- if .Values.pixelfed.mail.password }}
   password: {{ .Values.pixelfed.mail.password }}
+  {{- end }}
 {{- end }}