diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 7c58b07..1900506 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -934,6 +934,13 @@ nis_user:
     is_samba_user: true
     password: 'spa2014'
 
+  - name: daniel
+    groups:
+      - intern
+      - buero
+    is_samba_user: true
+    password: '210984'
+
   - name: eva
     groups:
       - intern
@@ -963,6 +970,14 @@ nis_user:
     is_samba_user: true
     password: 'sommer13'
 
+  - name: lea
+    groups:
+      - intern
+      - buero
+      - lpadmin
+    is_samba_user: true
+    password: '091190'
+
   - name: linda
     groups:
       - intern
@@ -1228,10 +1243,12 @@ samba_shares:
       - bueropraktikum
       - chema
       - chris
+      - daniel
       - eva
       - isadora
       - konstantin
       - lara
+      - lea
       - linda
       - margit
       - mariam
@@ -1262,10 +1279,12 @@ samba_shares:
       - bueropraktikum
       - chema
       - chris
+      - daniel
       - eva
       - isadora
       - konstantin
       - lara
+      - lea
       - linda
       - margit
       - mariam
@@ -1441,6 +1460,19 @@ sudoers_server_file_user_privileges: []
 #
 sudoers_server_file_group_privileges: []
 
+# ==========
+# vars used by roles/common/tasks/ubuntu-x11vnc-1604-amd64.yml
+# vars used by roles/common/tasks/ubuntu-x11vnc-1804-amd64.yml
+# ==========
+
+vnc_password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          33613238356632313236343438636262376636373736316233623064633539383165663730313639
+          3764656337363966393232373264323765306664616339660a303332626532333064316136356264
+          62393531663765616339303334616565343565663731323466643835363236336464383437393832
+          6466363462393166380a666634313964626266343835343831303337356134353232643733623139
+          3331
+
 
 # ========================================
 # ========================================
diff --git a/group_vars/all/main.yml.BAK.2021-06-01 b/group_vars/all/main.yml.BAK.2021-06-01
index 909f263..6ecf71d 100644
--- a/group_vars/all/main.yml.BAK.2021-06-01
+++ b/group_vars/all/main.yml.BAK.2021-06-01
@@ -36,6 +36,7 @@ samba_shares:
       - bueropraktikum
       - chema
       - chris
+      - daniel
       - eva
       - hannah
       - isadora
@@ -43,6 +44,7 @@ samba_shares:
       - konstantin
       - kristin
       - lara
+      - lea
       - linda
       - margit
       - marei
@@ -172,6 +174,13 @@ nis_user:
     is_samba_user: true
     password: 'spa2014'
 
+  - name: daniel
+    groups:
+      - intern
+      - buero
+    is_samba_user: true
+    password: '210984'
+
   - name: elke
     groups:
       - intern
@@ -229,6 +238,13 @@ nis_user:
     is_samba_user: true
     password: 'sommer13'
 
+  - name: lea
+    groups:
+      - intern
+      - buero
+    is_samba_user: true
+    password: '091190'
+
   - name: linda
     groups:
       - intern
diff --git a/roles/common/tasks/nis-install-client.yml b/roles/common/tasks/nis-install-client.yml
index 665b378..6276cc0 100644
--- a/roles/common/tasks/nis-install-client.yml
+++ b/roles/common/tasks/nis-install-client.yml
@@ -74,6 +74,15 @@
     - nis-install
     - nis-install-client
 
+- name: (nis-install-client.yml) Adjust file /etc/default/nis - set 'YPBINDARGS' (client)
+  replace:
+    path: /etc/default/nis
+    regexp: '^YPBINDARGS=.*'
+    replace: 'YPBINDARGS='
+  tags:
+    - nis-install
+    - nis-install-client
+
 
 # ---
 # /etc/{passwd,group,shadow}
diff --git a/roles/common/templates/lib/systemd/system/x11vnc-gdm3.service.j2 b/roles/common/templates/lib/systemd/system/x11vnc-gdm3.service.j2
new file mode 100644
index 0000000..c271560
--- /dev/null
+++ b/roles/common/templates/lib/systemd/system/x11vnc-gdm3.service.j2
@@ -0,0 +1,11 @@
+# {{ ansible_managed }}
+[Unit]
+Description=Start x11vnc at startup.
+After=multi-user.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/x11vnc -loop -forever -bg -rfbport 5900 -xkb -noxrecord -noxfixes -noxdamage -shared -norc -auth /run/user/{{ grp_id_gdm.stdout }}/gdm/Xauthority -rfbauth /etc/x11vnc.pass
+
+[Install]
+WantedBy=multi-user.target
diff --git a/roles/common/templates/lib/systemd/system/x11vnc.service.j2 b/roles/common/templates/lib/systemd/system/x11vnc.service.j2
new file mode 100644
index 0000000..fb2470f
--- /dev/null
+++ b/roles/common/templates/lib/systemd/system/x11vnc.service.j2
@@ -0,0 +1,11 @@
+# {{ ansible_managed }}
+[Unit]
+Description=Start x11vnc at startup.
+After=multi-user.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/x11vnc -auth guess -forever -loop -noxdamage -repeat -rfbauth /etc/x11vnc.pass -rfbport 5900 -shared
+
+[Install]
+WantedBy=multi-user.target