diff --git a/roles/matrix-client-element/tasks/init.yml b/roles/matrix-client-element/tasks/init.yml
index a42e31437..6458d67c7 100644
--- a/roles/matrix-client-element/tasks/init.yml
+++ b/roles/matrix-client-element/tasks/init.yml
@@ -6,5 +6,5 @@
 # for self buildig it is explicitly needed, so we rather fail here
 - name: Fail if running on Ansible lower than 2.8 and trying self building
   fail:
-    msg: "To self build the Element image, you should usa ansible 2.8 or higher. E.g. pip contains such packages."
+    msg: "To self build the Element image, you should use ansible 2.8 or higher. E.g. pip contains such packages."
   when: "ansible_version.major == 2 and ansible_version.minor < 8 and matrix_client_element_container_image_self_build"
diff --git a/roles/matrix-email2matrix/tasks/setup_email2matrix.yml b/roles/matrix-email2matrix/tasks/setup_email2matrix.yml
index d5fa73a51..3f7b34bed 100644
--- a/roles/matrix-email2matrix/tasks/setup_email2matrix.yml
+++ b/roles/matrix-email2matrix/tasks/setup_email2matrix.yml
@@ -79,10 +79,10 @@
   file:
     path: "{{ matrix_email2matrix_base_path }}"
     state: absent
-  when: "not matrix_email2matrix_enabled|bool"
+  when: "not matrix_email2matrix_enabled|bool and matrix_email2matrix_service_stat.stat.exists"
 
 - name: Ensure Email2Matrix Docker image doesn't exist
   docker_image:
     name: "{{ matrix_email2matrix_docker_image }}"
     state: absent
-  when: "not matrix_email2matrix_enabled|bool"
+  when: "not matrix_email2matrix_enabled|bool and matrix_email2matrix_service_stat.stat.exists"