diff --git a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
index 1887535c..8de44520 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup
@@ -2,7 +2,7 @@
 source /etc/default/bazzite
 
 # SCRIPT VERSION
-HWS_VER=1
+HWS_VER=2
 HWS_VER_FILE="/etc/bazzite/hws_version"
 HWS_VER_RAN=$(cat $HWS_VERSION_FILE)
 
@@ -84,6 +84,13 @@ elif [[ $IMAGE_NAME =~ "deck"  ]]; then
   systemctl --global disable --now sdgyrodsu.service
 fi
 
+# REVERT ME, disable desktop-autologin if gamescope-autologin is enabled
+if [[ $IMAGE_NAME =~ "deck"  ]]; then
+  if systemctl is-enabled --quiet gamescope-autologin; then
+    systemctl disable --now desktop-autologin
+  fi
+fi
+
 if grep -qz "Kernel driver in use: radeon" <<< $GPU_ID; then
   echo "Legacy AMD hardware detected, enabling CIK and SI support in AMDGPU"
   if [[ ! $KARGS =~ "radeon.si_support" ]]; then