diff --git a/ansible/templates/alerta.conf b/ansible/templates/alerta.conf
index f8aabfa..d318ddc 100644
--- a/ansible/templates/alerta.conf
+++ b/ansible/templates/alerta.conf
@@ -21,5 +21,4 @@ skip_mta = False
 smtp_host = {{ smtp_host }}
 smtp_password = {{ smtp_passwd }}
 smtp_port = {{ smtp_port }}
-smtp_starttls = True
-smtp_username = {{ mail_from }}
+smtp_starttls = {{ smtp_starttls }}
diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml
index d9948e0..18ad2ee 100644
--- a/ansible/vars/all.yml
+++ b/ansible/vars/all.yml
@@ -13,5 +13,6 @@ keycloak_url: "https://id.autonomic.zone"
 mail_from: "alerta-noreply@autonomic.zone"
 mail_to: "kaboom@autonomic.zone"
 smtp_host: "mail.gandi.net"
-smtp_username: "alerta-noreply"
 smtp_port: "587"
+smtp_starttls: "True"
+smtp_username: "alerta-noreply"