diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index e5345fae..8e566f38 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1093,10 +1093,15 @@ function configure_user_interface {
 
 	if [[ $VARIANT != "usb" ]]; then
 		# log in automatically
-		chroot "$rootdir" apt-get -y install nodm
+		chroot "$rootdir" apt-get -y install nodm xinit
 		echo 'NODM_ENABLED=true' > /etc/default/nodm
 		echo "NODM_USER=$MY_USERNAME" >> /etc/default/nodm
 
+		chroot "$rootdir" mkdir /etc/systemd/system/getty@tty1.service.d
+		echo '[Service]' > $rootdir/etc/systemd/system/getty@tty1.service.d/override.conf
+		echo 'ExecStart=' >> $rootdir/etc/systemd/system/getty@tty1.service.d/override.conf
+		echo 'ExecStart=-/sbin/agetty --autologin fbone --noclear %I $TERM' >> $rootdir/etc/systemd/system/getty@tty1.service.d/override.conf
+
 		# change the desktop background
 		if [ $MESH_DESKTOP_BACKGROUND_IMAGE ]; then
 			if [ -f $MESH_DESKTOP_BACKGROUND_IMAGE ]; then