diff --git a/system_files/deck/shared/usr/libexec/bazzite-enable-hhd b/system_files/deck/shared/usr/libexec/bazzite-enable-hhd
index 86ae82f6..14a18bb4 100755
--- a/system_files/deck/shared/usr/libexec/bazzite-enable-hhd
+++ b/system_files/deck/shared/usr/libexec/bazzite-enable-hhd
@@ -1,3 +1,3 @@
 #!/usr/bin/bash
 
-systemctl enable --now hhd@$(systemd-escape $1).service
+systemctl enable --now hhd@$(systemd-escape "$(getent passwd $PKEXEC_UID | cut -d: -f1)").service
diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index 2a18db78..4e7791f5 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -118,7 +118,7 @@ if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegam
   # HHD Setup
   if /usr/libexec/hardware/hhd-supported-hardware; then
     echo 'Enabling HHD'
-    pkexec /usr/libexec/bazzite-enable-hhd "$USER"
+    pkexec /usr/libexec/bazzite-enable-hhd
   fi
 
   # SDGyroDSU Setup
diff --git a/system_files/desktop/shared/usr/libexec/bazzite-privileged-user-setup b/system_files/desktop/shared/usr/libexec/bazzite-privileged-user-setup
index 455aa7ed..c61a0e93 100755
--- a/system_files/desktop/shared/usr/libexec/bazzite-privileged-user-setup
+++ b/system_files/desktop/shared/usr/libexec/bazzite-privileged-user-setup
@@ -2,3 +2,6 @@
 
 # Enable NTP
 timedatectl set-ntp true
+
+# Allow Tailscale Control
+tailscale set --operator="$(getent passwd $PKEXEC_UID | cut -d: -f1)"