diff --git a/roles/jitsi_jibri/tasks/conf.yml b/roles/jitsi_jibri/tasks/conf.yml
index 9a9c3fc..03a5416 100644
--- a/roles/jitsi_jibri/tasks/conf.yml
+++ b/roles/jitsi_jibri/tasks/conf.yml
@@ -7,3 +7,12 @@
     - jibri.conf
   notify: restart jitsi-jibri
   tags: jitsi
+
+- name: Configure pam
+  copy:
+    content: |
+      #%PAM-1.0
+      auth    required pam_permit.so
+      account required pam_permit.so
+    dest: /etc/pam.d/xserver
+  tags: jitsi
diff --git a/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2 b/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2
index 6d48f0f..559a067 100644
--- a/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2
+++ b/roles/jitsi_jibri/templates/jitsi-jibri-xorg.service.j2
@@ -6,7 +6,8 @@ After=network.target
 User={{ jitsi_jibri_user }}
 Group={{ jitsi_jibri_user }}
 Environment=DISPLAY=:0
-ExecStart=/usr/bin/Xorg -nocursor -noreset  +extension RANDR +extension RENDER -config {{ jitsi_root_dir }}/etc/jibri/xorg-video-dummy.conf :0
+WorkingDirectory={{ jitsi_root_dir }}/etc/jibri/
+ExecStart=/usr/bin/Xorg -nocursor -noreset  +extension RANDR +extension RENDER -config xorg-video-dummy.conf :0
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure