diff --git a/defaults/main.yaml b/defaults/main.yaml
index 501241c..48ae94d 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -41,13 +41,15 @@ application_shortcuts:
 
 ssh_over_tor: false
 
-session_lock_command: xset s activate
-session_enable_screensaver_command: /usr/local/bin/screensaver-enable
-session_disable_screensaver_command: /usr/local/bin/screensaver-disable
 system_suspend_command: systemctl suspend
 system_reboot_command: systemctl reboot
 system_poweroff_command: systemctl poweroff
 
+session_lock_enabled: "{{ (home_profile != 'presentation') and (home_profile != 'vdesk') }}"
+session_lock_command: xset s activate
+session_enable_screensaver_command: /usr/local/bin/screensaver-enable
+session_disable_screensaver_command: /usr/local/bin/screensaver-disable
+
 file_browser_command: thunar
 calculator_command: "{{default_browser}} --new-window https://www.geogebra.org/calculator"
 mail_command: thunderbird
diff --git a/tasks/screensaver.yaml b/tasks/screensaver.yaml
index 6aafc28..afb3463 100644
--- a/tasks/screensaver.yaml
+++ b/tasks/screensaver.yaml
@@ -3,8 +3,5 @@
 - name: screensaver graphical-session service enabled
   systemd:
     name: screensaver.service
-    enabled: true
+    enabled: "{{ session_lock_enabled }}"
     scope: user
-  when:
-    - home_profile != "presentation"
-    - home_profile != "vdesk"