diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index 7ea1a9c..b0d359e 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -79,7 +79,7 @@ fi
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
 
-# set up timed auto-login for after 60 seconds
+# set up auto-login
 cat >> /etc/gdm/custom.conf << FOE
 [daemon]
 AutomaticLoginEnable=True
diff --git a/fedora-livecd-xfce.ks b/fedora-livecd-xfce.ks
index 1934437..bd7198f 100644
--- a/fedora-livecd-xfce.ks
+++ b/fedora-livecd-xfce.ks
@@ -203,12 +203,11 @@ rm -f /etc/xdg/autostart/xfconf-migration-4.6.desktop || :
 mkdir -p /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml
 cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 
-# set up timed auto-login for after 60 seconds
+# set up auto-login
 cat >> /etc/gdm/custom.conf << FOE
 [daemon]
-TimedLoginEnable=true
-TimedLogin=liveuser
-TimedLoginDelay=60
+AutomaticLoginEnable=True
+AutomaticLogin=liveuser
 FOE
 
 # Show harddisk install on the desktop