diff --git a/utilities/build/config.template b/utilities/build/config.template
index ef64ff72..7c2509ad 100644
--- a/utilities/build/config.template
+++ b/utilities/build/config.template
@@ -7,6 +7,7 @@ TIMEZONE_DEFAULT="America/New_York"
 KEYBOARD_LAYOUT="English (US)"
 FIRST_USER_NAME="pi"
 FIRST_USER_PASS="$FIRST_USER_PASS"
+DISABLE_FIRST_BOOT_USER_RENAME="1"
 WPA_COUNTRY="US"
 ENABLE_SSH="1"
 DEPLOY_COMPRESSION="xz"
diff --git a/utilities/build/stage-solar/00-install-solar-protocol/01-run.sh b/utilities/build/stage-solar/00-install-solar-protocol/01-run.sh
index 2290babd..2f2a00e8 100755
--- a/utilities/build/stage-solar/00-install-solar-protocol/01-run.sh
+++ b/utilities/build/stage-solar/00-install-solar-protocol/01-run.sh
@@ -63,8 +63,6 @@ install -d "${ROOTFS_DIR}/usr/lib/userpass-pi"
 install -m 755 files/usr/lib/userpass-pi/userpass-service "${ROOTFS_DIR}/usr/lib/userpass-pi/userpass-service"
 
 on_chroot << EOF
-  systemctl disable userconfig.service
-  systemctl mask userconfig.service
   systemctl enable userpass.service
 EOF