diff --git a/salt/elastalert/files/predefined/jira_auth.yaml.jinja b/salt/elastalert/files/predefined/jira_auth.yaml.jinja
index 3f537c92b..8ae240157 100644
--- a/salt/elastalert/files/predefined/jira_auth.yaml.jinja
+++ b/salt/elastalert/files/predefined/jira_auth.yaml.jinja
@@ -1,6 +1,6 @@
-{% if elastalert.jira_user | length > 0 %}
+{% if elastalert.get('jira_user', '') | length > 0 and elastalert.get('jira_pass', '') | length > 0 %}
 user: {{ elastalert.jira_user }}
 password: {{ elastalert.jira_pass }}
 {% else %}
-apikey: {{ elastalert.jira_key }}
+apikey: {{ elastalert.get('jira_key', '') }}
 {% endif %}
\ No newline at end of file
diff --git a/salt/elastalert/files/predefined/smtp_auth.yaml.jinja b/salt/elastalert/files/predefined/smtp_auth.yaml.jinja
index 483dd6810..0d488dd5c 100644
--- a/salt/elastalert/files/predefined/smtp_auth.yaml.jinja
+++ b/salt/elastalert/files/predefined/smtp_auth.yaml.jinja
@@ -1,2 +1,2 @@
-user: {{ elastalert.smtp_user }}
-password: {{ elastalert.smtp_pass }}
\ No newline at end of file
+user: {{ elastalert.get('smtp_user', '') }}
+password: {{ elastalert.get('smtp_pass', '') }}
\ No newline at end of file