diff --git a/Manual.org b/Manual.org
index c67b2a9..24f465e 100644
--- a/Manual.org
+++ b/Manual.org
@@ -1388,19 +1388,6 @@ b'\xde\xad\xbe\xef'
     src: templates/systemd/vdr-environ.j2
     dest: /etc/systemd/system/vdr.service.d/load-environ.conf
 
-- name: Stop xlogin
-  systemd:
-    name: xlogin@vdr.service
-    state: stopped
-    enabled: yes
-  ignore_errors: yes
-
-- name: Stop x
-  systemd:
-    name: x@vt7.service
-    state: stopped
-  ignore_errors: yes
-
 - name: install packages for xorg
   apt:
     name: '{{ item }}'
@@ -1417,9 +1404,15 @@ b'\xde\xad\xbe\xef'
     - read-edid
     #- yavdr-xorg
 
-- name: "stop x@vt7.service"
+- name: Stop xlogin
   systemd:
-    name: "x@vt7.service"
+    name: xlogin@vdr.service
+    state: stopped
+    enabled: yesg
+
+- name: Stop x
+  systemd:
+    name: x@vt7.service
     state: stopped
 
 - name: "expand template for x-verbose@.service"
diff --git a/roles/yavdr-xorg/tasks/main.yml b/roles/yavdr-xorg/tasks/main.yml
index 1e195cb..5085702 100644
--- a/roles/yavdr-xorg/tasks/main.yml
+++ b/roles/yavdr-xorg/tasks/main.yml
@@ -19,19 +19,6 @@
     src: templates/systemd/vdr-environ.j2
     dest: /etc/systemd/system/vdr.service.d/load-environ.conf
 
-- name: Stop xlogin
-  systemd:
-    name: xlogin@vdr.service
-    state: stopped
-    enabled: yes
-  ignore_errors: yes
-
-- name: Stop x
-  systemd:
-    name: x@vt7.service
-    state: stopped
-  ignore_errors: yes
-
 - name: install packages for xorg
   apt:
     name: '{{ item }}'
@@ -48,9 +35,15 @@
     - read-edid
     #- yavdr-xorg
 
-- name: "stop x@vt7.service"
+- name: Stop xlogin
   systemd:
-    name: "x@vt7.service"
+    name: xlogin@vdr.service
+    state: stopped
+    enabled: yesg
+
+- name: Stop x
+  systemd:
+    name: x@vt7.service
     state: stopped
 
 - name: "expand template for x-verbose@.service"