diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 5c0da253..6817fa67 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1077,9 +1077,15 @@ function configure_user_interface {
 	fi
 
 	# desktop
-	chroot "$rootdir" apt-get -y install mate-desktop-environment lightdm
+	chroot "$rootdir" apt-get -y install mate-desktop-environment
 
 	if [[ $VARIANT != "usb" ]]; then
+		# log in automatically
+		chroot "$rootdir" apt-get -y install nodm
+		echo 'NODM_ENABLED=true' > /etc/default/nodm
+		echo "NODM_USER=$MY_USERNAME" >> /etc/default/nodm
+
+		# change the desktop background
 		if [ $MESH_DESKTOP_BACKGROUND_IMAGE ]; then
 			if [ -f $MESH_DESKTOP_BACKGROUND_IMAGE ]; then
 				if [ -d $rootdir/usr/share/plymouth/themes/joy ]; then
@@ -1093,6 +1099,8 @@ function configure_user_interface {
 				fi
 			fi
 		fi
+	else
+		chroot "$rootdir" apt-get -y install lightdm
 	fi
 
 	# browser