diff --git a/defaults/main.yml b/defaults/main.yml
index df4cab4..d827741 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -33,3 +33,5 @@ install_cewe_fotobuch: false
 kiosk_unlocked_users: root
 
 xfwm4_use_compositing: true
+
+xfce_lock_panel: true
diff --git a/tasks/main.yaml b/tasks/main.yaml
index 18a5b4d..45d4644 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -2,10 +2,13 @@
 
 - import_tasks: ac-power.yaml
 
+- name: display_manager_background_image set_fact workaround
+  set_fact:
+    display_manager_background_image: "{{role_path}}/files/background/{{ kitapro_background_image }}"
+
 - import_role:
     name: display_manager
   vars:
-    display_manager_background_image: "background/{{ kitapro_background_image }}"
     display_manager_state: maintenance
     display_manager_maintenance_text: Aktualisierungen werden durchgeführt – bitte nicht abschalten!
     display_manager_maintenance_icon: system-software-update
@@ -29,5 +32,4 @@
 - import_role:
     name: display_manager
   vars:
-    display_manager_background_image: "background/{{ kitapro_background_image }}"
     display_manager_state: multiuser
diff --git a/templates/xfce4-panel.xml.j2 b/templates/xfce4-panel.xml.j2
index 6fd7905..796478d 100644
--- a/templates/xfce4-panel.xml.j2
+++ b/templates/xfce4-panel.xml.j2
@@ -5,7 +5,7 @@
 {% set application_starters = application_starters + ["kitaplus"] %}
 {% endif %}
 
-<channel name="xfce4-panel" version="1.0" locked="*" unlocked="{{kiosk_unlocked_users}}">
+<channel name="xfce4-panel" version="1.0" {% if xfce_lock_panel %} locked="*" unlocked="{{kiosk_unlocked_users}}" {% endif %}>
   <property name="configver" type="int" value="2"/>
   <property name="panels" type="array">
     <value type="int" value="1"/>