diff --git a/evoacme/tasks/acme.yml b/evoacme/tasks/acme.yml
index 4c16f7f0..e28b3b12 100644
--- a/evoacme/tasks/acme.yml
+++ b/evoacme/tasks/acme.yml
@@ -38,9 +38,16 @@
     group: acme
     state: directory
 
+- name: Is /etc/aliases present?
+  stat:
+    path: /etc/aliases
+  register: etc_aliases
+
 - name: Set acme aliases
   lineinfile:
     state: present
     dest: /etc/aliases
     line: 'acme: root'
+    regexp: 'acme:'
+  when: etc_aliases.stat.exists
   notify: "newaliases"
diff --git a/tomcat-instance/tasks/user.yml b/tomcat-instance/tasks/user.yml
index d18d9c1b..1a95b459 100644
--- a/tomcat-instance/tasks/user.yml
+++ b/tomcat-instance/tasks/user.yml
@@ -21,12 +21,18 @@
     group: "{{ tomcat_instance_name }}"
     mode: "u=rwx,g=rwxs,o="
 
+- name: Is /etc/aliases present?
+  stat:
+    path: /etc/aliases
+  register: etc_aliases
+
 - name: Set mail alias for user
   lineinfile:
     dest: '/etc/aliases'
     state: present
     line: "{{ tomcat_instance_name }}: {{ tomcat_instance_mail }}"
-  when: tomcat_instance_mail is defined
+    regexp: "{{ tomcat_instance_name }}:"
+  when: etc_aliases.stat.exists and tomcat_instance_mail is defined
   notify: new aliases
 
 - name: Enable sudo right