diff --git a/defaults/main.yaml b/defaults/main.yaml
index da87e2c..2b3bf2e 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -51,3 +51,9 @@ mail_command: thunderbird
 
 background_image: false
 home_copy_all_background_images: false
+
+home_autostart_terminal: true
+home_autostart_nm_applet: "{{ home_profile != 'vdesk' }}"
+home_autostart_blueman_applet: "{{ home_profile != 'vdesk' }}"
+home_autostart_pasystray: "{{ home_profile != 'vdesk' }}"
+home_autostart_unclutter: "{{ home_profile == 'presentation' }}"
diff --git a/tasks/desktop-apps.yaml b/tasks/desktop-apps.yaml
index 27a209a..f32e356 100644
--- a/tasks/desktop-apps.yaml
+++ b/tasks/desktop-apps.yaml
@@ -10,33 +10,30 @@
 - name: autostart terminal
   systemd:
     name: desktop-app@{{default_terminal}}.service
-    enabled: true
+    enabled: "{{ home_autostart_terminal }}"
     scope: user
 
 - name: autostart nm-applet
   systemd:
     name: desktop-app@nm-applet.service
-    enabled: true
+    enabled: "{{ home_autostart_nm_applet }}"
     scope: user
-  when: home_profile != "vdesk"
 
 - name: autostart blueman-applet
   systemd:
     name: desktop-app@blueman-applet.service
-    enabled: true
+    enabled: "{{ home_autostart_blueman_applet }}"
     scope: user
-  when: home_profile != "vdesk"
 
 - name: autostart pasystray
   systemd:
     name: desktop-app@pasystray.service
-    enabled: true
+    enabled: "{{ home_autostart_pasystray }}"
     scope: user
-  when: home_profile != "vdesk"
+  when:
 
-- name: do not autostart unclutter
+- name: autostart unclutter
   systemd:
     name: desktop-app@unclutter.service
-    enabled: false
+    enabled: "{{ home_autostart_unclutter }}"
     scope: user
-  when: home_profile == "presentation"