diff --git a/fedora-riscv64-developer-rawhide.ks b/fedora-riscv64-developer-rawhide.ks
index 6593951..71af513 100644
--- a/fedora-riscv64-developer-rawhide.ks
+++ b/fedora-riscv64-developer-rawhide.ks
@@ -15,10 +15,6 @@ timezone --utc America/New_York
 selinux --disabled
 services --enabled=sshd,NetworkManager,chronyd,haveged --disabled=lm_sensors
 
-# Fedora 31
-# https://fedoraproject.org/wiki/Changes/DisableRootPasswordLoginInSshd
-user --name riscv --groups=wheel --plaintext --password=fedora_riscv
-
 bootloader --location=none --extlinux
 
 zerombr
@@ -252,6 +248,12 @@ dnf config-manager --set-disabled rawhide updates updates-testing fedora fedora-
 # and mounting processes. This should help on systems where boot takes longer.
 sed -i 's|noatime|noatime,x-systemd.device-timeout=300s,x-systemd.mount-timeout=300s|g' /etc/fstab
 
+# Fedora 31
+# https://fedoraproject.org/wiki/Changes/DisableRootPasswordLoginInSshd
+useradd -c "Fedora RISCV User" riscv
+echo fedora_riscv | passwd --stdin riscv > /dev/null
+usermod -aG wheel riscv > /dev/null
+
 # Create Fedora RISC-V repo
 cat << EOF > /etc/yum.repos.d/fedora-riscv.repo
 [fedora-riscv]