diff -up spin-kickstarts-0.13.3/fedora-live-base.ks.liveuser spin-kickstarts-0.13.3/fedora-live-base.ks
--- spin-kickstarts-0.13.3/fedora-live-base.ks.liveuser	2010-02-17 17:56:02.000000000 -0500
+++ spin-kickstarts-0.13.3/fedora-live-base.ks	2010-04-30 11:00:50.000000000 -0400
@@ -173,7 +173,6 @@ mountPersistentHome() {
   # we should make that the real /home.  useful for mtd device on olpc
   if [ -d /home/home ]; then mount --bind /home/home /home ; fi
   [ -x /sbin/restorecon ] && /sbin/restorecon /home
-  if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
 }
 
 findPersistentHome() {
@@ -207,9 +206,7 @@ if [ -n "\$configdone" ]; then
   exit 0
 fi
 
-# add fedora user with no passwd
-action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
-passwd -d liveuser > /dev/null
+[ -x /etc/init.d/livesys-adduser ] && /etc/init.d/livesys-adduser 
 
 # turn off firstboot for livecd boots
 chkconfig --level 345 firstboot off 2>/dev/null
@@ -270,6 +267,20 @@ fi
 
 EOF
 
+cat > /etc/init.d/livesys-adduser << EOF
+#!/bin/bash
+# Script to create the livesys-adduser
+# Remove this script if you do not want the liveuser created
+#
+if [ -d /home/liveuser ]; then USERADDARGS="-M" ; fi
+# add fedora user with no passwd
+action "Adding live user" useradd \$USERADDARGS -c "Live System User" liveuser
+passwd -d liveuser > /dev/null
+EOF
+
+chmod 755 /etc/init.d/livesys-adduser
+/sbin/restorecon /etc/init.d/livesys-adduser
+
 # bah, hal starts way too late
 cat > /etc/rc.d/init.d/livesys-late << EOF
 #!/bin/bash