diff --git a/charts/pixelfed/Chart.yaml b/charts/pixelfed/Chart.yaml
index 6f792ac..38ff7f7 100644
--- a/charts/pixelfed/Chart.yaml
+++ b/charts/pixelfed/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.1
+version: 0.2.2
 
 # This is the version number of the application being deployed.
 # renovate:image=ghcr.io/mattlqx/docker-pixelfed
diff --git a/charts/pixelfed/README.md b/charts/pixelfed/README.md
index 2e1bb3c..1ccbfc5 100644
--- a/charts/pixelfed/README.md
+++ b/charts/pixelfed/README.md
@@ -1,6 +1,6 @@
 # pixelfed
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.3-nginx](https://img.shields.io/badge/AppVersion-v0.12.3--nginx-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.3-nginx](https://img.shields.io/badge/AppVersion-v0.12.3--nginx-informational?style=flat-square)
 
 A Helm chart for deploying Pixelfed on Kubernetes
 
@@ -190,4 +190,4 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | volumes | list | `[]` | Additional volumes on the output Deployment definition. |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
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 }}