diff --git a/tasks/main.yml b/tasks/main.yml
index f7a8ce8..94c0b6e 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,10 +29,12 @@
   notify: restart lightdm
 
 - include: mainentance.yml
+  when: display_manager_state == 'mainentance'
 
 - name: lightdm started
   service:
     name: lightdm
     state: started
+    enabled: yes
 
 - meta: flush_handlers