diff --git a/misc_systemd_units/lightdm.service b/misc_systemd_units/lightdm.service
index aabd4427..0d407868 100644
--- a/misc_systemd_units/lightdm.service
+++ b/misc_systemd_units/lightdm.service
@@ -1,5 +1,6 @@
 [Unit]
 After=systemd-user-sessions.service
+ConditionPathExists=/node/tags/desktop
 
 [Service]
 ExecStart=/usr/bin/lightdm
diff --git a/pdist/pdist-bootcheck b/pdist/pdist-bootcheck
index 3c8e4f1a..a2e7a490 100755
--- a/pdist/pdist-bootcheck
+++ b/pdist/pdist-bootcheck
@@ -26,7 +26,8 @@ else
 fi
 
 if [ "$need_async_pdist" ]; then
-    netcat $(distmaster) 237 >/dev/null 2>&1 </dev/null &
+    systemd-run --unit pdist-async-update --service-type=simple --remain-after-exit \
+        netcat $(distmaster) 237
     echo triggered background update
 elif [ "$need_pdist_and_reboot" ]; then
     if [[ -e /var/run/updatecheck.reboot-triggered ]]; then
@@ -34,7 +35,8 @@ elif [ "$need_pdist_and_reboot" ]; then
         rm /var/run/updatecheck.reboot-triggered
         exit 1
     fi
-    echo "Update and reboot required. Please be patient..."
+    echo "Update and reboot required"
+    while true; do sleep 5; echo "System update in progress. Please be patient..."; done &
     netcat $(distmaster) 237
     mxgrub default
     touch /var/run/updatecheck.reboot-triggered