diff --git a/bin/kali-finish-install b/bin/kali-finish-install
index 9456690..462ba03 100755
--- a/bin/kali-finish-install
+++ b/bin/kali-finish-install
@@ -33,6 +33,7 @@ get_user_list() {
 	fi
 	echo "$user"
     done
+    echo "root"
 }
 
 configure_zsh() {
diff --git a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
index 8b941f9..6bd1ed2 100755
--- a/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
+++ b/kali-config/common/includes.chroot/usr/lib/live/config/0031-kali-user-setup
@@ -10,6 +10,7 @@ configure_zsh() {
 	return
     fi
     chsh --shell /usr/bin/zsh kali
+    chsh --shell /usr/bin/zsh root
 }
 
 configure_kaboxer() {
diff --git a/kali-config/common/includes.installer/kali-finish-install b/kali-config/common/includes.installer/kali-finish-install
index 9456690..462ba03 100755
--- a/kali-config/common/includes.installer/kali-finish-install
+++ b/kali-config/common/includes.installer/kali-finish-install
@@ -33,6 +33,7 @@ get_user_list() {
 	fi
 	echo "$user"
     done
+    echo "root"
 }
 
 configure_zsh() {
diff --git a/simple-cdd/profiles/kali.postinst b/simple-cdd/profiles/kali.postinst
index 9456690..462ba03 100755
--- a/simple-cdd/profiles/kali.postinst
+++ b/simple-cdd/profiles/kali.postinst
@@ -33,6 +33,7 @@ get_user_list() {
 	fi
 	echo "$user"
     done
+    echo "root"
 }
 
 configure_zsh() {