diff --git a/install.sh b/install.sh
index 2a5bfcd..f4bcd4d 100755
--- a/install.sh
+++ b/install.sh
@@ -120,7 +120,7 @@ cp $CWD/root/march-reboot.sh /mnt/root/march-reboot.sh
 chmod +x /mnt/root/march-chroot.sh
 chmod +x /mnt/root/march-reboot.sh
 
-arch-chroot /mnt /root/march-chroot.sh -t $timezone -l $locale -h $hostname -u $username -s $sudogrp
+arch-chroot /mnt /root/march-chroot.sh -t "$timezone" -l "$locale" -h $hostname" -u "$username" -s "$sudogrp" -c "$cryptroot" -r "$rootpart"
 
 umount $bootpart
 swapoff $swappart
diff --git a/root/march-chroot.sh b/root/march-chroot.sh
index f203f87..62d2c2d 100644
--- a/root/march-chroot.sh
+++ b/root/march-chroot.sh
@@ -111,7 +111,6 @@ linux /vmlinuz-linux
 initrd /initramfs-linux.img
 options rw cryptdevice=$(blkid $rootpart | cut -d" " -f2 | tr -d \"):cryptroot root=$cryptroot i8042.noloop i8042.nomux i8042.nopnp i8042.reset" > /boot/loader/entries/arch.conf
 
-sed -i "s/march-reboot.sh/\0 -u $username -s $sudogrp/" /etc/systemd/system/march.service
+sed -i "s/march-reboot.sh/\0 -u \"$username\" -s \"$sudogrp\"/" /etc/systemd/system/march.service
 
 systemctl enable march.service
-systemctl enable dhcpcd.service