diff --git a/templates/default.j2 b/templates/default.j2
index 91ba9c3..a42b6e0 100644
--- a/templates/default.j2
+++ b/templates/default.j2
@@ -63,8 +63,12 @@ GF_SESSION_COOKIE_SECURE="true"
 
 GF_SMTP_ENABLED="{{ grafana_smtp_enabled | lower }}"
 GF_SMTP_HOST="{{ grafana_smtp_host }}"
+{% if grafana_smtp_user | default(False) %}
 GF_SMTP_USER="{{ grafana_smtp_user }}"
+{% endif %}
+{% if grafana_smtp_password | default(False) %}
 GF_SMTP_PASSWORD="{{ grafana_smtp_password }}"
+{% endif %}
 GF_SMTP_FROM_ADDRESS="{{ grafana_smtp_address }}"
 GF_SMTP_FROM_NAME="{{ grafana_smtp_name }}"