diff --git a/config/templates/config-example.conf b/config/templates/config-example.conf
index 9291dba6e0..a6bfa19eb4 100644
--- a/config/templates/config-example.conf
+++ b/config/templates/config-example.conf
@@ -10,6 +10,7 @@ CLEAN_LEVEL="make,debs,oldcache"	# comma-separated list of clean targets: "make"
 					# "oldcache" = remove old cached rootfs except for the newest 6 files
 
 DEST_LANG="en_US.UTF-8"			# sl_SI.UTF-8, en_US.UTF-8
+DISPLAY_MANAGER="nodm"			# "nodm" = autologin, "lightdm" = standard login manager. Affect desktop targets only.
 
 # advanced
 KERNEL_KEEP_CONFIG="no"			# do not overwrite kernel config before compilation
diff --git a/lib/desktop.sh b/lib/desktop.sh
index f352861680..988d8becf7 100644
--- a/lib/desktop.sh
+++ b/lib/desktop.sh
@@ -50,7 +50,7 @@ install_desktop ()
 	fi
 
 	# Choose display manager
-	if [[ $DISPLAY_MANAGER == yes ]]; then	chroot $SDCARD /bin/bash -c "apt-get install -qq -y --no-install-recommends lightdm-gtk-greeter lightdm"; \
+	if [[ $DISPLAY_MANAGER == lightdm ]]; then	chroot $SDCARD /bin/bash -c "apt-get install -qq -y --no-install-recommends lightdm-gtk-greeter lightdm"; \
 	else chroot $SDCARD /bin/bash -c "apt-get install -qq -y --no-install-recommends nodm"; fi
 
 	# Disable desktop mode autostart for now to enforce creation of normal user account