diff --git a/roles/docker-compose/tasks/01_core.yml b/roles/docker-compose/tasks/01_core.yml
index 6c3a9a1b..7890cae9 100644
--- a/roles/docker-compose/tasks/01_core.yml
+++ b/roles/docker-compose/tasks/01_core.yml
@@ -5,14 +5,14 @@
     path: "{{ PATH_DOCKER_COMPOSE_PULL_LOCK_DIR }}"
     state: absent
 
+- name: "reset (if enabled) for {{ role_name}}"
+  include_tasks: 02_reset.yml
+  when: MODE_RESET | bool
+
 - name: "Load docker container role"
   include_role:
     name: docker-container
   when: run_once_docker_container is not defined
-  
-- name: "reset (if enabled)"
-  include_tasks: 02_reset.yml
-  when: MODE_RESET | bool
 
 - name: "create {{ PATH_DOCKER_COMPOSE_INSTANCES }}"
   file:
diff --git a/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml b/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml
index 4992fb43..5a31387b 100644
--- a/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml
+++ b/roles/sys-ctl-bkp-docker-2-loc/tasks/01_core.yml
@@ -9,7 +9,7 @@
 - include_tasks: 02_pkgmgr_routines.yml
   when: backup_docker_to_local_folder is not defined
 
-- name: "reset (if enabled)"
+- name: "reset (if enabled) for {{ role_name}}"
   include_tasks: 03_reset.yml
   when: MODE_RESET | bool
 
diff --git a/roles/sys-daemon/tasks/main.yml b/roles/sys-daemon/tasks/main.yml
index 062df24c..7dcfd059 100644
--- a/roles/sys-daemon/tasks/main.yml
+++ b/roles/sys-daemon/tasks/main.yml
@@ -1,5 +1,5 @@
 - block:
-  - name: "reset (if enabled)"
+  - name: "reset (if enabled) for {{ role_name}}"
     include_tasks: 01_reset.yml
     when: MODE_RESET | bool and run_once_sys_daemon is not defined
   - name: Apply systemd manager defaults
diff --git a/roles/sys-service/tasks/01_core.yml b/roles/sys-service/tasks/01_core.yml
index bf16167c..2b1f2ebf 100644
--- a/roles/sys-service/tasks/01_core.yml
+++ b/roles/sys-service/tasks/01_core.yml
@@ -3,7 +3,7 @@
     name: sys-daemon
   when: run_once_sys_daemon is not defined
   
-- name: "reset (if enabled)"
+- name: "reset (if enabled) for {{ role_name}}"
   include_tasks: 02_reset.yml
   when: MODE_RESET | bool
 
diff --git a/roles/sys-svc-msmtp/tasks/01_core.yml b/roles/sys-svc-msmtp/tasks/01_core.yml
index ac6f4a39..13c4f072 100644
--- a/roles/sys-svc-msmtp/tasks/01_core.yml
+++ b/roles/sys-svc-msmtp/tasks/01_core.yml
@@ -17,9 +17,13 @@
 
 - name: "Load Mailu Routines for '{{ role_name }}'"
   include_tasks: 02_mailu.yml
-  when: 
-    - mail_host_reachability is defined
-    - mail_host_reachability.status | default(0) not in [200, 301, 302]
+  when:
+    - "'web-app-mailu' in group_names"
+    - >
+        (mail_host_reachability is defined and
+         (mail_host_reachability.status | default(0)) not in [200, 301, 302])
+        or
+        not (users['no-reply'].mailu_token | default(false) | bool)
 
 - name: install msmtp msmtp-mta
   community.general.pacman:
diff --git a/roles/sys-svc-webserver-core/tasks/01_core.yml b/roles/sys-svc-webserver-core/tasks/01_core.yml
index e620724a..c36e284f 100644
--- a/roles/sys-svc-webserver-core/tasks/01_core.yml
+++ b/roles/sys-svc-webserver-core/tasks/01_core.yml
@@ -4,7 +4,7 @@
     MODE_CLEANUP | bool or
     MODE_RESET | bool
 
-- name: "reset (if enabled)"
+- name: "reset (if enabled) for {{ role_name}}"
   include_tasks: 03_reset.yml
   when: MODE_RESET | bool
 
diff --git a/roles/web-app-discourse/tasks/01_core.yml b/roles/web-app-discourse/tasks/01_core.yml
index 695d21a2..59c45162 100644
--- a/roles/web-app-discourse/tasks/01_core.yml
+++ b/roles/web-app-discourse/tasks/01_core.yml
@@ -1,4 +1,4 @@
-- name: "reset (if enabled)"
+- name: "reset (if enabled) for {{ role_name}}"
   include_tasks: 02_reset.yml
   when: MODE_RESET | bool