diff --git a/tasks/main.yml b/tasks/main.yml
index 12c2b18..6a750bb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,22 +10,22 @@
 
 - name: Install updates
   include_tasks: update.yml
-  when: common_settingsonly == false
+  when: common_settingsonly | default(false) == false
 
 # if role has not changed, this will not be needed when just installing updates
 - name: Install essential tools
   include_tasks: essentials.yml
-  when: common_settingsonly == false
+  when: common_settingsonly | default(false) == false
 
 # if role has not changed, this will not be needed when just installing updates
 - name: Install more tools
   include_tasks: tools.yml
-  when: common_settingsonly == false
+  when: common_settingsonly | default(false) == false
 
 # this will just run once, because of a lock-file
 - name: Basics - Setup user shell
   include_tasks: usersetup.yml
-  when: common_settingsonly == false
+  when: common_settingsonly | default(false) == false
 
 # run this for every maintenance/ update cycle
 - name: Apply user settings