diff --git a/TODO b/TODO
index f72380b..69c2822 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,4 @@
 - terminal, browser on desktop
 - theme: style "Clearlooks", icons "elementary Xfce"
 - nilmdb wallpaper, was "xubuntu-quantal.png"
-- preseed username, password, login automatically?
-- disable 13.04 upgrade notification?
-- precreate database and streams
 - try xubuntu 13.04
diff --git a/customize-inner.sh b/customize-inner.sh
index ae16170..dcf5106 100644
--- a/customize-inner.sh
+++ b/customize-inner.sh
@@ -25,6 +25,10 @@ for VER in $(ls --sort=version /lib/modules/ | head -n -1) ; do
     apt-get -y --purge remove ".*$VER.*"
 done
 
+# Disable upgrade popups
+sed -i -s -e 's/Prompt=normal/Prompt=never/g' \
+    /etc/update-manager/release-upgrades
+
 # some stuff we need from Ubuntu
 apt-get -y install \
     wbritish \
@@ -218,5 +222,4 @@ nilmtool -u http://127.0.0.1:18646/ create /data/prep-a float32_8
 nilmtool -u http://127.0.0.1:18646/ create /data/prep-b float32_8
 nilmtool -u http://127.0.0.1:18646/ create /data/prep-c float32_8
 kill $!
-sleep 1
-kill -9 $! || true
+wait
diff --git a/customize.sh b/customize.sh
index 3a717e6..6b71e58 100755
--- a/customize.sh
+++ b/customize.sh
@@ -5,13 +5,14 @@ set -e
 set -x
 
 # Customize the outer ISO image
-sed -i -e \
+sed -i -s -e \
     "s/DISKNAME.*/DISKNAME  NilmDBuntu $VERSION by Jim Paris/" \
     ${ISO}/README.diskdefines
 
 # The .disk/info file is important -- it's used by ubiquity to extract
 # out the distro name in dialogs, and I think casper might use it too
 echo "NilmDBuntu $VERSION by Jim Paris" > ${ISO}/.disk/info
+rm -f ${ISO}/.disk/release_notes_url
 
 # Set up preseed file
 cp ${ISO}/preseed/xubuntu.seed ${ISO}/preseed/nilmdbuntu.seed
@@ -22,14 +23,22 @@ cat >> ${ISO}/preseed/nilmdbuntu.seed <<"EOF"
 d-i preseed/late_command string \
     in-target rm /etc/ssh/ssh_host_*; \
     in-target dpkg-reconfigure openssh-server; \
-    in-target sed -i 's/quiet splash//g' /etc/default/grub; \
+    in-target sed -i -s 's/quiet splash//g' /etc/default/grub; \
     in-target update-grub; \
     echo "done"
+
+# Default user.  Ubiquity should let them change this
+d-i passwd/user-fullname string NILM User
+d-i passwd/username string nilm
+#d-i passwd/user-password password nilm
+#d-i passwd/user-password-again password nilm
+d-i user-setup/allow-password-weak boolean true
+d-i passwd/auto-login boolean true
 EOF
 
 # Rename Xubuntu to NilmDBuntu in boot scripts; also changes
 # preseed file to the custom one
-sed -i \
+sed -i -s \
     -e "s/Xubuntu/NilmDBuntu/g;" \
     -e "s/Kubuntu/NilmDBuntu/g;" \
     -e "s/Ubuntu/NilmDBuntu/g;" \
@@ -40,7 +49,7 @@ sed -i \
 
 # Remove quiet and splash from boot command lines.  Easier than a
 # custom plymouth theme and it's helpful.
-sed -i -e "s/ quiet splash//g;" \
+sed -i -s -e "s/ quiet splash//g;" \
     ${ISO}/isolinux/txt.cfg ${ISO}/boot/grub/{grub,loopback}.cfg
 
 # Run the customize-inner.sh script inside the chroot