diff --git a/roles/sys-svc-msmtp/templates/msmtprc.conf.j2 b/roles/sys-svc-msmtp/templates/msmtprc.conf.j2
index a9943501..7f16ecfb 100644
--- a/roles/sys-svc-msmtp/templates/msmtprc.conf.j2
+++ b/roles/sys-svc-msmtp/templates/msmtprc.conf.j2
@@ -10,11 +10,11 @@ tls_trust_file /etc/ssl/certs/ca-certificates.crt
 tls            off
 {% endif %}
 
-account        {{ DEFAULT_EMAIL_ACCOUNT }}
+account        system_email_no_reply
 host           {{ SYSTEM_EMAIL.HOST }}
 port           {{ SYSTEM_EMAIL.PORT }}
 from           {{ users['no-reply'].email }}
 user           {{ users['no-reply'].email }}
 password       {{ users['no-reply'].mailu_token }}
 
-account default : {{ DEFAULT_EMAIL_ACCOUNT }}
\ No newline at end of file
+account default : system_email_no_reply
\ No newline at end of file
diff --git a/roles/sys-svc-msmtp/vars/main.yml b/roles/sys-svc-msmtp/vars/main.yml
deleted file mode 100644
index c9a82916..00000000
--- a/roles/sys-svc-msmtp/vars/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_EMAIL_ACCOUNT: "{{ SOFTWARE_NAME | replace('.', '_') | lower }}__default_email_account"