diff --git a/extra/packages.both b/extra/packages.both
index 69e5996..cc7956d 100644
--- a/extra/packages.both
+++ b/extra/packages.both
@@ -138,7 +138,8 @@ iso-codes
 isomaster
 jasper
 jfsutils
-john-mpi
+#john-mpi
+john
 keyutils
 kismet-allplugins
 libisoburn
@@ -217,7 +218,7 @@ php
 php-fpm
 php-gd
 php-mcrypt
-phrasendrescher
+#phrasendrescher
 pigz
 pkgfile
 pkgtools
@@ -240,7 +241,6 @@ rdiff-backup
 read-edid
 reaver
 rename
-rescan-scsi-bus
 rfkill
 rp-pppoe
 rpcbind
diff --git a/lib/mk.chroot.sh b/lib/mk.chroot.sh
index 273401c..3081058 100755
--- a/lib/mk.chroot.sh
+++ b/lib/mk.chroot.sh
@@ -212,7 +212,7 @@ EOF
     echo "${REGUSR} ALL=(ALL) ALL" >> ${i}/etc/sudoers.d/${REGUSR}
     if [ -n "${REGUSR_PASS}" ];
     then
-      ${CHROOTCMD} ${i}/ echo "${REGUSR}:${REGUSR_PASS}" | chpasswd -e 
+      ${CHROOTCMD} ${i}/ "echo ${REGUSR}:${REGUSR_PASS} | chpasswd -e"
     fi
     # COMMENT THIS LINE IF YOU WANT TO SET A ROOT PASSWORD
     ${CHROOTCMD} ${i}/ usermod -L root
diff --git a/overlay/etc/systemd/system/multi-user.target.wants/openvpn@grainwreck b/overlay/etc/systemd/system/multi-user.target.wants/openvpn@grainwreck
new file mode 120000
index 0000000..f33817e
--- /dev/null
+++ b/overlay/etc/systemd/system/multi-user.target.wants/openvpn@grainwreck
@@ -0,0 +1 @@
+/usr/lib/systemd/system/openvpn@.service
\ No newline at end of file