diff --git a/data/motd b/data/issue
similarity index 59%
rename from data/motd
rename to data/issue
index e83e73d..d8255d4 100644
--- a/data/motd
+++ b/data/issue
@@ -1,12 +1,10 @@
 ###############################################################################
 
-Welcome to the Void Linux Live system, you have been autologged in.
-This user has full sudo(8) permissions without any password, be careful
-executing commands through sudo(8).
+Welcome to the Void Linux Live system, the `root` password is `voidlinux`.
 
 To start the installation please type:
 
-    $ sudo void-installer
+    $ void-installer
 
 and follow the on-screen instructions. Thanks for using Void Linux.
 
diff --git a/dracut/adduser.sh b/dracut/adduser.sh
index 736e33e..9dd7ddc 100644
--- a/dracut/adduser.sh
+++ b/dracut/adduser.sh
@@ -14,7 +14,7 @@ echo "USERNAME=$USERNAME" >> ${NEWROOT}/etc/default/live.conf
 chmod 644 ${NEWROOT}/etc/default/live.conf
 
 # Create new user and remove password. We'll use autologin by default.
-chroot ${NEWROOT} useradd -c $USERNAME -m $USERNAME -G wheel -s /bin/bash
+chroot ${NEWROOT} useradd -c $USERNAME -m $USERNAME -G wheel -s /bin/sh
 chroot ${NEWROOT} passwd -d $USERNAME >/dev/null 2>&1
 
 # Setup default root password (voidlinux).
@@ -25,21 +25,6 @@ if [ -f ${NEWROOT}/etc/sudoers ]; then
     echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> ${NEWROOT}/etc/sudoers
 fi
 
-# Enable autologin for agetty(8) on tty1 with runit.
-if [ -d ${NEWROOT}/etc/runit ]; then
-    sed "s|agetty|& -a $USERNAME|" -i ${NEWROOT}/etc/sv/agetty-tty1/run
-fi
-
-# Enable autologin for agetty(8) on tty1 with systemd.
-if [ -d ${NEWROOT}/etc/systemd/system ]; then
-    rm -f "${NEWROOT}/etc/systemd/system/getty.target.wants/getty@tty1.service"
-    sed -e "s|/sbin/agetty --noclear|& -a ${USERNAME}|g" \
-        "${NEWROOT}/usr/lib/systemd/system/getty@.service" > \
-        "${NEWROOT}/etc/systemd/system/getty@.service"
-    ln -sf /etc/systemd/system/getty@.service \
-        "${NEWROOT}/etc/systemd/system/getty.target.wants/getty@tty1.service"
-fi
-
 if [ -d ${NEWROOT}/etc/polkit-1 ]; then
     # If polkit is installed allow users in the wheel group to run anything.
     cat > ${NEWROOT}/etc/polkit-1/rules.d/void-live.rules <<_EOF
diff --git a/mklive.sh.in b/mklive.sh.in
index f41009a..2a83647 100644
--- a/mklive.sh.in
+++ b/mklive.sh.in
@@ -314,11 +314,9 @@ install_prereqs
 info_msg "[3/9] Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..."
 install_packages
 
-#
-# Prepare /etc/motd.
-#
 mkdir -p "$ROOTFS"/etc
 [ -s data/motd ] && cp data/motd $ROOTFS/etc
+[ -s data/issue ] && cp data/issue $ROOTFS/etc
 
 export PATH=$VOIDHOSTDIR/usr/bin:$VOIDHOSTDIR/usr/sbin:$PATH
 export LD_LIBRARY_PATH=$VOIDHOSTDIR/usr/lib