diff --git a/deb_bugger.sh b/deb_bugger.sh
index dadac22..adddc6a 100755
--- a/deb_bugger.sh
+++ b/deb_bugger.sh
@@ -82,7 +82,7 @@ apt-get -y install git libsecret-1-0 libsecret-1-dev build-essential vim \
         elpa-dockerfile-mode elpa-web-mode elpa-yaml-mode docker-compose-
 
 # Need this for rootless podman
-if grep -q '^daniel' /etc/shadow; then
+if grep -q '^daniel:' /etc/shadow; then
     loginctl enable-linger daniel
 fi
 
@@ -122,7 +122,7 @@ if [ "$(systemctl is-active display-manager)" = 'inactive' ]; then
 fi
 
 # User-specific DESKTOP stuff
-if grep -q '^daniel' /etc/shadow; then
+if who -u | grep '\(:0\)$' | grep -q '^daniel'; then
     # PipeWire
     apt-get -y install wireplumber libspa-0.2-bluetooth \
             pipewire-media-session-