diff --git a/roles/neomutt/templates/account.neomuttrc.j2 b/roles/neomutt/templates/account.neomuttrc.j2
index 5c3228f..0ea4b7b 100644
--- a/roles/neomutt/templates/account.neomuttrc.j2
+++ b/roles/neomutt/templates/account.neomuttrc.j2
@@ -23,8 +23,10 @@ set imap_check_subscribed
 {% if account.imap %}
 set imap_user = "{{ account.imap.login }}"
 set imap_pass = "`pass {{ account.passlocation }}`"
-set ssl_starttls = yes
-set ssl_force_tls = yes
 {% endif %}
 
-set smtp_url = "{{ account.smtp.proto }}://{{ account.smtp.login }}:`pass {{ account.passlocation }}`@{{ account.smtp.server }}:{{ account.smtp.port }}"
+set smtp_pass = "`pass {{ account.passlocation }}`"
+set smtp_url = "{{ account.smtp.proto }}://{{ account.smtp.login }}@{{ account.smtp.server }}:{{ account.smtp.port }}"
+
+set ssl_starttls = yes
+set ssl_force_tls = yes