diff --git a/Manual.org b/Manual.org
index 26d549a..f3246eb 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1467,7 +1467,7 @@ b'\xde\xad\xbe\xef'
 
 - name: Stop xlogin
   systemd:
-    name: xlogin@vdr.service
+    name: 'xlogin@{{ vdr.user }}.service'
     state: stopped
     enabled: yes
 
@@ -1611,8 +1611,9 @@ b'\xde\xad\xbe\xef'
     src: /usr/bin/start-desktop
     dest: /var/lib/vdr/plugins/desktop/starter
     state: link
+    force: false
   
-- name: enable and start xlogin for the user vdr
+- name: enable and start xlogin for the vdr user
   systemd:
     daemon_reload: yes
     name: 'xlogin@{{ vdr.user }}'
diff --git a/roles/yavdr-xorg/tasks/desktop-session.yml b/roles/yavdr-xorg/tasks/desktop-session.yml
index fc0812a..b5f5d29 100644
--- a/roles/yavdr-xorg/tasks/desktop-session.yml
+++ b/roles/yavdr-xorg/tasks/desktop-session.yml
@@ -90,8 +90,9 @@
     src: /usr/bin/start-desktop
     dest: /var/lib/vdr/plugins/desktop/starter
     state: link
+    force: false
   
-- name: enable and start xlogin for the user vdr
+- name: enable and start xlogin for the vdr user
   systemd:
     daemon_reload: yes
     name: 'xlogin@{{ vdr.user }}'
diff --git a/roles/yavdr-xorg/tasks/detect-xorg.yml b/roles/yavdr-xorg/tasks/detect-xorg.yml
index a7bb769..0e54e87 100644
--- a/roles/yavdr-xorg/tasks/detect-xorg.yml
+++ b/roles/yavdr-xorg/tasks/detect-xorg.yml
@@ -21,7 +21,7 @@
 
 - name: Stop xlogin
   systemd:
-    name: xlogin@vdr.service
+    name: 'xlogin@{{ vdr.user }}.service'
     state: stopped
     enabled: yes