diff -Nru lightdm-1.7.3/debian/changelog lightdm-1.7.3/debian/changelog
--- lightdm-1.7.3/debian/changelog	2013-06-21 04:46:39.000000000 +0200
+++ lightdm-1.7.3/debian/changelog	2013-06-25 22:35:03.000000000 +0200
@@ -1,3 +1,12 @@
+lightdm (1.7.3-0ubuntu2) saucy; urgency=low
+
+  * debian/guest-account: disable screen locking in a more reliable way.
+    Rather than trying to write a key for another user, while setting up the
+    guest user account, just set up an autostart desktop that will set it 
+    during the login (lp: #951000)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 25 Jun 2013 22:30:04 +0200
+
 lightdm (1.7.3-0ubuntu1) saucy; urgency=low
 
   * New upstream release:
diff -Nru lightdm-1.7.3/debian/guest-account lightdm-1.7.3/debian/guest-account
--- lightdm-1.7.3/debian/guest-account	2013-06-21 04:46:39.000000000 +0200
+++ lightdm-1.7.3/debian/guest-account	2013-06-25 22:39:21.000000000 +0200
@@ -59,13 +59,6 @@
   # setup session
   #
 
-  # disable screensaver, to avoid locking guest out of itself (no password)
-  if [ -e /usr/bin/gconftool-2 ]; then
-   su $USER <<EOF
-   gconftool-2 --set --type bool /desktop/gnome/lockdown/disable_lock_screen True
-EOF
-  fi
-
   # disable some services that are unnecessary for the guest session
   mkdir --parents "$HOME"/.config/autostart
   cd /etc/xdg/autostart/
@@ -78,6 +71,11 @@
     fi
   done
 
+  echo "[Desktop Entry]" >> "$HOME"/.config/autostart/screenlocking.desktop
+  echo "Name='Disable screen locking in guest session'" >> "$HOME"/.config/autostart/screenlocking.desktop
+  echo "Type=Application" >> "$HOME"/.config/autostart/screenlocking.desktop
+  echo "Exec=gsettings set org.gnome.desktop.lockdown disable-lock-screen true" >> "$HOME"/.config/autostart/screenlocking.desktop
+
   mkdir -p "$HOME"/.kde/share/config
   echo "[Basic Settings]" >> "$HOME"/.kde/share/config/nepomukserverrc
   echo "Start Nepomuk=false" >> "$HOME"/.kde/share/config/nepomukserverrc