diff --git a/distfiles/etc/systemd/system/getty@tty1.service.d/autologin.conf b/distfiles/etc/systemd/system/getty@tty1.service.d/autologin.conf
new file mode 100644
index 0000000..07a57dc
--- /dev/null
+++ b/distfiles/etc/systemd/system/getty@tty1.service.d/autologin.conf
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty --noclear --autologin kioskuser %I $TERM
\ No newline at end of file
diff --git a/distfiles/home/kioskuser/.bashrc b/distfiles/home/kioskuser/.bashrc
new file mode 100644
index 0000000..75841ca
--- /dev/null
+++ b/distfiles/home/kioskuser/.bashrc
@@ -0,0 +1,8 @@
+if [ $(tty) == "/dev/tty1" ]; then
+    while true
+	do
+		startx
+		echo "X session ended, restarting..."
+		sleep 5
+	done
+fi
\ No newline at end of file
diff --git a/distfiles/home/kioskuser/.profile b/distfiles/home/kioskuser/.profile
index 649e6a3..c9db459 100644
--- a/distfiles/home/kioskuser/.profile
+++ b/distfiles/home/kioskuser/.profile
@@ -20,4 +20,3 @@ fi
 if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
-/usr/bin/startx /etc/X11/Xsession /usr/local/bin/openkiosk -- :0
diff --git a/distfiles/home/kioskuser/.xinitrc b/distfiles/home/kioskuser/.xinitrc
new file mode 100755
index 0000000..18e8320
--- /dev/null
+++ b/distfiles/home/kioskuser/.xinitrc
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+while true
+do
+    /usr/local/bin/openkiosk
+done
diff --git a/distfiles/home/kioskuser/.xpdfrc b/distfiles/home/kioskuser/.xpdfrc
new file mode 100644
index 0000000..1d77b18
--- /dev/null
+++ b/distfiles/home/kioskuser/.xpdfrc
@@ -0,0 +1,7 @@
+# Include global config
+include /etc/xpdf/xpdfrc
+
+# Disable mouse buttons
+unbind mousePress3 any
+unbind mousePress2 any
+unbind mousePress1 any
\ No newline at end of file