diff --git a/preseed/debian/stretch/preseed.cfg b/preseed/debian/stretch/preseed.cfg
index d82e7aa..80ecdb0 100644
--- a/preseed/debian/stretch/preseed.cfg
+++ b/preseed/debian/stretch/preseed.cfg
@@ -355,7 +355,7 @@ d-i   cdrom-detect/eject                          boolean false
 d-i preseed/late_command string in-target chsh -s /bin/zsh ; \
 umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \
 in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \
-in-target /bin/sed -i 's/without-password/yes/g' /etc/ssh/sshd_config ; \
+in-target /bin/sed -i 's/\(^\|^\#\)\(PermitRootLogin\).*/\2 yes/g' /etc/ssh/sshd_config ; \
 in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \
 in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \
 in-target /bin/sh /tmp/latecommand/post.sh
diff --git a/preseed/debian/stretch/preseed_cinnamon.cfg b/preseed/debian/stretch/preseed_cinnamon.cfg
index 261e370..aa25fef 100644
--- a/preseed/debian/stretch/preseed_cinnamon.cfg
+++ b/preseed/debian/stretch/preseed_cinnamon.cfg
@@ -346,7 +346,6 @@ d-i   cdrom-detect/eject                          boolean false
 d-i preseed/late_command string in-target chsh -s /bin/zsh ; \
 umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \
 in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \
-#in-target /bin/sed -i 's/without-password/yes/g' /etc/ssh/sshd_config ; \
 in-target /bin/sed -i 's/.*\(PermitRootLogin\).*/\1 yes/g' /etc/ssh/sshd_config ; \
 in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \
 in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \
diff --git a/preseed/debian/stretch/preseed_gnome.cfg b/preseed/debian/stretch/preseed_gnome.cfg
index c9d312b..db592b0 100644
--- a/preseed/debian/stretch/preseed_gnome.cfg
+++ b/preseed/debian/stretch/preseed_gnome.cfg
@@ -346,7 +346,7 @@ d-i   cdrom-detect/eject                          boolean false
 d-i preseed/late_command string in-target chsh -s /bin/zsh ; \
 umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \
 in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \
-in-target /bin/sed -i 's/without-password/yes/g' /etc/ssh/sshd_config ; \
+in-target /bin/sed -i 's/\(^\|^\#\)\(PermitRootLogin\).*/\2 yes/g' /etc/ssh/sshd_config ; \
 in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \
 in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \
 in-target /bin/sh /tmp/latecommand/post.sh
diff --git a/preseed/debian/stretch/preseed_mate.cfg b/preseed/debian/stretch/preseed_mate.cfg
index df96cf3..b51c7dc 100644
--- a/preseed/debian/stretch/preseed_mate.cfg
+++ b/preseed/debian/stretch/preseed_mate.cfg
@@ -346,7 +346,7 @@ d-i   cdrom-detect/eject                          boolean false
 d-i preseed/late_command string in-target chsh -s /bin/zsh ; \
 umount /dev/sys/lv_free ; lvremove -f /dev/sys/lv_free ; \
 in-target /bin/rmdir /mnt/free ; in-target /bin/sed -i '/lv_free/d' /etc/fstab ; \
-in-target /bin/sed -i 's/without-password/yes/g' /etc/ssh/sshd_config ; \
+in-target /bin/sed -i 's/\(^\|^\#\)\(PermitRootLogin\).*/\2 yes/g' /etc/ssh/sshd_config ; \
 in-target /usr/bin/tftp 129.20.203.27 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \
 in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \
 in-target /bin/sh /tmp/latecommand/post.sh