diff --git a/archboxcommand.bash b/archboxcommand.bash
index d17e761..23c9493 100755
--- a/archboxcommand.bash
+++ b/archboxcommand.bash
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 source /etc/archbox.conf
-echo executing $@
-chroot $CHROOT /bin/su -c $@ $USER
\ No newline at end of file
+COMMAND=$(echo $@ | tr ' ' '\ ')
+chroot $CHROOT /bin/su -c "$COMMAND" $USER
\ No newline at end of file
diff --git a/archboxenter.bash b/archboxenter.bash
index 23c9493..596f2ed 100755
--- a/archboxenter.bash
+++ b/archboxenter.bash
@@ -1,5 +1,4 @@
 #!/bin/bash
 
 source /etc/archbox.conf
-COMMAND=$(echo $@ | tr ' ' '\ ')
-chroot $CHROOT /bin/su -c "$COMMAND" $USER
\ No newline at end of file
+chroot $CHROOT /bin/su $USER
\ No newline at end of file
diff --git a/install.sh b/install.sh
index 69300c4..ff149e4 100755
--- a/install.sh
+++ b/install.sh
@@ -4,4 +4,4 @@ cp -v ./archbox.bash /usr/local/bin/archbox
 cp -v ./archbox.conf /etc/archbox.conf
 cp -v ./archboxenter.bash /usr/local/share/archbox/bin/archboxenter
 cp -v ./copyresolv.bash /usr/local/share/archbox/bin/copyresolv
-cp -v ./archboxenter.bash /usr/local/share/archbox/bin/archboxcommand
+cp -v ./archboxcommand.bash /usr/local/share/archbox/bin/archboxcommand