diff --git a/config/includes.chroot/lib/live/config/1165-fix-openssh-server b/config/includes.chroot/lib/live/config/1165-fix-openssh-server
new file mode 100644
index 0000000..a92580c
--- /dev/null
+++ b/config/includes.chroot/lib/live/config/1165-fix-openssh-server
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Allow PasswordAuthentification in sshd config
+sed -i -e 's|\(PasswordAuthentication\) no|\1 yes|' /etc/ssh/sshd_config
+
+# Do not allow root login without password
+sed -i -e 's|\(PermitRootLogin\) without-password|\1 yes|' /etc/ssh/sshd_config