diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 2e95556011..9af67e7384 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -369,6 +369,7 @@ zap_root_password () {
 # allow openssh accept login with empty password string
 openssh_allow_empty_password () {
 	if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then
+		sed -i 's#.*PermitRootLogin.*#PermitRootLogin yes#' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config
 		sed -i 's#.*PermitEmptyPasswords.*#PermitEmptyPasswords yes#' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config
 	fi
 }