diff --git a/roles/sys-svc-msmtp/tasks/01_core.yml b/roles/sys-svc-msmtp/tasks/01_core.yml
index 5c4a7a5e..bebffd1a 100644
--- a/roles/sys-svc-msmtp/tasks/01_core.yml
+++ b/roles/sys-svc-msmtp/tasks/01_core.yml
@@ -1,7 +1,4 @@
-- include_role:
-    name: sys-ctl-hlth-msmtp
-  when: run_once_sys_ctl_hlth_msmtp is not defined
-  
+
 - name: install msmtp msmtp-mta
   community.general.pacman:
     name:
@@ -14,3 +11,7 @@
     src: "msmtprc.conf.j2"
     dest: "/root/.msmtprc"
     mode: 600
+
+- include_role:
+    name: sys-ctl-hlth-msmtp
+  when: run_once_sys_ctl_hlth_msmtp is not defined
\ No newline at end of file
diff --git a/roles/sys-svc-msmtp/templates/msmtprc.conf.j2 b/roles/sys-svc-msmtp/templates/msmtprc.conf.j2
index a827a757..a9943501 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        system_email
+account        {{ DEFAULT_EMAIL_ACCOUNT }}
 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 : system_email
\ No newline at end of file
+account default : {{ DEFAULT_EMAIL_ACCOUNT }}
\ No newline at end of file
diff --git a/roles/sys-svc-msmtp/vars/main.yml b/roles/sys-svc-msmtp/vars/main.yml
new file mode 100644
index 00000000..c9a82916
--- /dev/null
+++ b/roles/sys-svc-msmtp/vars/main.yml
@@ -0,0 +1 @@
+DEFAULT_EMAIL_ACCOUNT: "{{ SOFTWARE_NAME | replace('.', '_') | lower }}__default_email_account"