diff --git a/usr/share/ublue-os/firstboot/launcher/login-profile.sh b/usr/share/ublue-os/firstboot/launcher/login-profile.sh
index fe1d6b6..f91fd27 100644
--- a/usr/share/ublue-os/firstboot/launcher/login-profile.sh
+++ b/usr/share/ublue-os/firstboot/launcher/login-profile.sh
@@ -1,6 +1,15 @@
-if test "$(id -u)" -gt "0" && test -d "$HOME"; then
-    if test ! -e "$HOME"/.config/autostart/ublue-firstboot.desktop; then
+# Only process users with home directories, but skip the "root" user.
+if [ "$(id -u)" != "0" ] && [ -d "$HOME" ]; then
+    # Ensure target file exists and is a symlink (not a regular file or dir).
+    if [ ! -L "$HOME"/.config/autostart/ublue-firstboot.desktop ]; then
+        # Remove any leftovers or incorrect (non-link) files with the same name.
+        rm -rf "$HOME"/.config/autostart/ublue-firstboot.desktop
+
+        # Create symlink to uBlue's autostart runner.
+        # Note that "broken autostart symlinks" are harmless if they remain
+        # after distro switching, and just cause a minor syslog warning. The
+        # user can manually delete this file if they migrate away from uBlue.
         mkdir -p "$HOME"/.config/autostart
-        cp -f /usr/etc/skel.d/.config/autostart/ublue-firstboot.desktop "$HOME"/.config/autostart
+        ln -s "/usr/share/ublue-os/firstboot/launcher/autostart.desktop" "$HOME"/.config/autostart/ublue-firstboot.desktop
     fi
-fi
\ No newline at end of file
+fi