diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
index f5b6d160..c75c9d36 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
+++ b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -46,11 +46,6 @@ screens:
       show_terminal: true
       package_manager: yafti.plugin.run
       groups:
-        Enable Auto Login:
-          description: Skip the login screen and boot straight to the desktop
-          default: false
-          packages:
-          - Enable Auto Login: just --unstable enable-auto-login
         Greenlight:
           description: A utility for xCloud and xHome streaming
           default: false
diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
index f9b646c2..a72371d8 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/custom.just
@@ -122,16 +122,6 @@ install-fleek-themes:
     echo "Install fleek with just install-fleek before running just install-fleek-themes."
   fi
 
-# Enable passwordless automatic login to the desktop
-enable-auto-login:
-  #!/usr/bin/env bash
-  source /etc/default/bazzite
-  if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
-    systemctl enable --now gnome-autologin
-  elif [[ ${BASE_IMAGE_NAME} == 'kinoite' ]]; then
-    systemctl enable --now plasma-autologin
-  fi
-
 # Install Greenlight xCloud and xHome streaming AppImage
 get-greenlight:
   #!/usr/bin/env bash