diff --git a/debian/changelog b/debian/changelog
index 15359759..5b584b3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+livecd-rootfs (2.173) UNRELEASED; urgency=low
+
+  [Michael Terry]
+  * Add phablet user to nopasswdlogin group on Touch images
+  * Switch min uid to 1002 to prevent system users from showing in
+    the greeter on Touch images
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 14 Aug 2013 11:01:47 +0200
+
 livecd-rootfs (2.172) saucy; urgency=low
 
   * Reenabling click package installation hook. 
diff --git a/live-build/ubuntu-touch/hooks/01-setup_user.chroot b/live-build/ubuntu-touch/hooks/01-setup_user.chroot
index b214eb58..20883e13 100755
--- a/live-build/ubuntu-touch/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-touch/hooks/01-setup_user.chroot
@@ -9,9 +9,15 @@ adduser --gecos $USER --disabled-login $USER --uid $UGID
 echo "I: set user $USER password to $USER"
 echo "$USER:$USER" | chpasswd
 
+echo "I: allowing user to log in without password"
+gpasswd -a $USER nopasswdlogin
+
 adduser --gecos system --no-create-home --disabled-login --disabled-password system --uid 1000
 adduser --gecos radio --no-create-home --disabled-login --disabled-password radio --uid 1001
 
+# Prevent the system user from being presented in the greeter by bumping MIN_UID
+sed -i 's/^\(UID_MIN\s\+\).*/\11002/g' /etc/login.defs
+
 mkdir -p /home/$USER/Music
 mkdir -p /home/$USER/Pictures
 mkdir -p /home/$USER/Videos