diff --git a/void-install/sv/runsvdir/finish b/void-install/sv/runsvdir/finish
old mode 100644
new mode 100755
index 92e2dc2..2175fd1
--- a/void-install/sv/runsvdir/finish
+++ b/void-install/sv/runsvdir/finish
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-user=@USER@
+ZUSER=@USER@
 
-sv -w600 force-stop /home/$user/sv/*
-sv exit /home/$user/sv/*
+sv -w600 force-stop /home/$ZUSER/sv/*
+sv exit /home/$ZUSER/sv/*
diff --git a/void-install/sv/runsvdir/run b/void-install/sv/runsvdir/run
old mode 100644
new mode 100755
index d8940a7..41c8917
--- a/void-install/sv/runsvdir/run
+++ b/void-install/sv/runsvdir/run
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-USER=@USER@
-HOME="/home/$USER"
-GROUPS=$(id -Gn "$USER" | tr ' ' ':')
+ZUSER=@USER@
+export HOME="/home/$ZUSER"
+GROUPS=$(id -Gn "$ZUSER" | tr ' ' ':')
 SVDIR="$HOME/sv"
-ID=$(id -u $USER)
+ID=$(id -u $ZUSER)
 
 [ ! -d /run/user/$ID ] && \
-    mkdir -p /run/user/$USER && \
-    chown $USER:$USER /run/user/$USER
+    mkdir -p /run/user/$ZUSER && \
+    chown $ZUSER:$ZUSER /run/user/$ZUSER
 
-exec chpst -u "$USER:$GROUPS" sh -l -c "exec runsvdir $SVDIR $USER '...'" $USER
+exec chpst -u "$ZUSER:$GROUPS" sh -l -c "exec runsvdir $SVDIR $ZUSER '...'" $ZUSER