diff --git a/charts/stable/authelia/Chart.yaml b/charts/stable/authelia/Chart.yaml
index 1daa58f2e84..f7c7138e4a4 100644
--- a/charts/stable/authelia/Chart.yaml
+++ b/charts/stable/authelia/Chart.yaml
@@ -39,7 +39,7 @@ sources:
   - https://github.com/authelia/chartrepo
   - https://github.com/authelia/authelia
 type: application
-version: 14.0.17
+version: 14.0.18
 annotations:
   truecharts.org/catagories: |
     - security
diff --git a/charts/stable/authelia/questions.yaml b/charts/stable/authelia/questions.yaml
index 99d8e1d35e8..ee71113c598 100644
--- a/charts/stable/authelia/questions.yaml
+++ b/charts/stable/authelia/questions.yaml
@@ -509,13 +509,11 @@ questions:
                       schema:
                         type: string
                         default: ""
-                        required: true
                     - variable: plain_password
                       label: "Password"
                       schema:
                         type: string
                         default: ""
-                        required: true
                     - variable: sender
                       label: "Sender"
                       schema:
diff --git a/charts/stable/authelia/templates/_configmap.tpl b/charts/stable/authelia/templates/_configmap.tpl
index ca0842c6d98..9424df306ad 100644
--- a/charts/stable/authelia/templates/_configmap.tpl
+++ b/charts/stable/authelia/templates/_configmap.tpl
@@ -173,7 +173,9 @@ data:
         host: {{ $notifier.smtp.host }}
         port: {{ default 25 $notifier.smtp.port }}
         timeout: {{ default "5s" $notifier.smtp.timeout }}
-        username: {{ $notifier.smtp.username }}
+        {{- with $notifier.smtp.username }}
+        username: {{ . }}
+        {{- end }}
         sender: {{ $notifier.smtp.sender }}
         identifier: {{ $notifier.smtp.identifier }}
         subject: {{ $notifier.smtp.subject | quote }}
diff --git a/charts/stable/authelia/templates/_secrets.tpl b/charts/stable/authelia/templates/_secrets.tpl
index 81fbe92ff70..3c66d93cf99 100644
--- a/charts/stable/authelia/templates/_secrets.tpl
+++ b/charts/stable/authelia/templates/_secrets.tpl
@@ -36,7 +36,7 @@ data:
   LDAP_PASSWORD: {{ .Values.authentication_backend.ldap.plain_password | b64enc | quote }}
   {{- end }}
 
-  {{- if .Values.notifier.smtp.enabled }}
+  {{- if and .Values.notifier.smtp.enabled .Values.notifier.smtp.plain_password }}
   SMTP_PASSWORD: {{ .Values.notifier.smtp.plain_password | b64enc | quote }}
   {{- end }}