diff --git a/lib/configuration.sh b/lib/configuration.sh
index 7cde8ec6a6..33efcfcc7e 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -131,7 +131,7 @@ case $DISPLAY_MANAGER in
 	;;
 
 	lightdm)
-	PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP lightdm-gtk-greeter lightdm"
+	PACKAGE_LIST_DESKTOP="$PACKAGE_LIST_DESKTOP lightdm lightdm-gtk-greeter"
 	;;
 
 	*)
diff --git a/lib/desktop.sh b/lib/desktop.sh
index 59e2ca7d00..4b655b705d 100644
--- a/lib/desktop.sh
+++ b/lib/desktop.sh
@@ -55,7 +55,6 @@ install_desktop ()
 
 	# install logo for login screen
 	cp $SRC/packages/blobs/desktop/icons/armbian.png $SDCARD/usr/share/pixmaps
-	cp -R $SRC/packages/blobs/desktop/lightdm $SDCARD/etc
 
 	# Compile Turbo Frame buffer for sunxi
 	if [[ $LINUXFAMILY == sun* && $BRANCH == default ]]; then
diff --git a/lib/makeboarddeb.sh b/lib/makeboarddeb.sh
index 9fcfee780a..f61c0db934 100644
--- a/lib/makeboarddeb.sh
+++ b/lib/makeboarddeb.sh
@@ -35,8 +35,8 @@ create_board_package()
 	Depends: bash, linux-base, u-boot-tools, initramfs-tools
 	Provides: armbian-bsp
 	Conflicts: armbian-bsp
-	Replaces: base-files, mpv, armbian-tools-$RELEASE
-	Recommends: bsdutils, parted, python3-apt, util-linux, toilet, wireless-tools
+	Replaces: base-files, mpv, lightdm-gtk-greeter, armbian-tools-$RELEASE
+	Recommends: bsdutils, parted, python3-apt, util-linux, toilet
 	Description: Armbian tweaks for $RELEASE on $BOARD ($BRANCH branch)
 	EOF
 
@@ -52,7 +52,7 @@ create_board_package()
 		mv /etc/network/interfaces.tmp /etc/network/interfaces
 	fi
 	# make a backup since we are unconditionally overwriting this on update
-	cp /etc/default/cpufrequtils /etc/default/cpufrequtils.dpkg-old
+	[ -f "/etc/default/cpufrequtils" ] && cp /etc/default/cpufrequtils /etc/default/cpufrequtils.dpkg-old
 	dpkg-divert --package linux-${RELEASE}-root-${DEB_BRANCH}${BOARD} --add --rename \
 		--divert /etc/mpv/mpv-dist.conf /etc/mpv/mpv.conf
 	exit 0
diff --git a/packages/blobs/desktop/lightdm/lightdm.conf.d/10-ubuntu.conf b/packages/blobs/desktop/lightdm/lightdm.conf.d/10-ubuntu.conf
deleted file mode 100644
index 433d23301f..0000000000
--- a/packages/blobs/desktop/lightdm/lightdm.conf.d/10-ubuntu.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[SeatDefaults]
-user-session=ubuntu
-greeter-show-manual-login=true    
-greeter-hide-users=true    
-allow-guest=false
diff --git a/packages/blobs/desktop/lightdm/lightdm-gtk-greeter.conf b/packages/bsp/common/etc/lightdm/lightdm-gtk-greeter.conf
similarity index 83%
rename from packages/blobs/desktop/lightdm/lightdm-gtk-greeter.conf
rename to packages/bsp/common/etc/lightdm/lightdm-gtk-greeter.conf
index 2cdc5010ac..b79a0f1f8d 100644
--- a/packages/blobs/desktop/lightdm/lightdm-gtk-greeter.conf
+++ b/packages/bsp/common/etc/lightdm/lightdm-gtk-greeter.conf
@@ -3,4 +3,4 @@ user-background=false
 theme-name=Numix
 icon-theme-name=Vibrancy-Colors-Full-Dark
 default-user-image=/usr/share/pixmaps/armbian.png
-indicators=~power;~language
+indicators=~language;~power
diff --git a/packages/bsp/common/etc/lightdm/lightdm.conf.d/11-armbian.conf b/packages/bsp/common/etc/lightdm/lightdm.conf.d/11-armbian.conf
new file mode 100644
index 0000000000..9b14b9557a
--- /dev/null
+++ b/packages/bsp/common/etc/lightdm/lightdm.conf.d/11-armbian.conf
@@ -0,0 +1,5 @@
+[SeatDefaults]
+user-session=ubuntu
+greeter-show-manual-login=false
+greeter-hide-users=false
+allow-guest=false
diff --git a/packages/bsp/common/etc/profile.d/check_first_login.sh b/packages/bsp/common/etc/profile.d/check_first_login.sh
index d7f6949cdf..ecf877e5e6 100644
--- a/packages/bsp/common/etc/profile.d/check_first_login.sh
+++ b/packages/bsp/common/etc/profile.d/check_first_login.sh
@@ -109,7 +109,7 @@ if [ -f /root/.not_logged_in_yet ] && [ -n "$BASH_VERSION" ] && [ "$-" != "${-#*
 			service nodm start
 		fi
 	elif [ -d "/etc/lightdm" ] && [ -n "$RealName" ] ; then
-			systemctl enable lightdm.service 2>/dev/null
+			ln -sf /lib/systemd/system/lightdm.service /etc/systemd/system/display-manager.service
 		if [[ -f /var/run/resize2fs-reboot ]]; then
 			# Let the user reboot now otherwise start desktop environment
 			printf "\n\n\e[0;91mWarning: a reboot is needed to finish resizing the filesystem \x1B[0m \n"