diff --git a/gdm-2.22.0-fix-auto-login.patch b/gdm-2.22.0-fix-auto-login.patch
index 1bb68e5..041bd80 100644
--- a/gdm-2.22.0-fix-auto-login.patch
+++ b/gdm-2.22.0-fix-auto-login.patch
@@ -1,6 +1,6 @@
diff -up gdm-2.22.0/common/gdm-settings-keys.h.fix-auto-login gdm-2.22.0/common/gdm-settings-keys.h
---- gdm-2.22.0/common/gdm-settings-keys.h.fix-auto-login 2008-06-27 12:49:43.000000000 -0400
-+++ gdm-2.22.0/common/gdm-settings-keys.h 2008-06-27 12:50:25.000000000 -0400
+--- gdm-2.22.0/common/gdm-settings-keys.h.fix-auto-login 2008-06-27 12:57:23.000000000 -0400
++++ gdm-2.22.0/common/gdm-settings-keys.h 2008-06-27 12:57:23.000000000 -0400
@@ -27,6 +27,8 @@ G_BEGIN_DECLS
#define GDM_KEY_USER "daemon/User"
@@ -10,29 +10,9 @@ diff -up gdm-2.22.0/common/gdm-settings-keys.h.fix-auto-login gdm-2.22.0/common/
#define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
#define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
#define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
-diff -up gdm-2.22.0/data/gdm.schemas.in.in.fix-auto-login gdm-2.22.0/data/gdm.schemas.in.in
---- gdm-2.22.0/data/gdm.schemas.in.in.fix-auto-login 2008-06-27 12:55:20.000000000 -0400
-+++ gdm-2.22.0/data/gdm.schemas.in.in 2008-06-27 12:55:08.000000000 -0400
-@@ -12,6 +12,16 @@
- gdm
-
-
-+ daemon/AutomaticLoginEnable
-+ b
-+ false
-+
-+
-+ daemon/AutomaticLogin
-+ s
-+
-+
-+
- daemon/TimedLoginEnable
- b
- false
-diff -up gdm-2.22.0/daemon/gdm-simple-slave.c.fix-autologin gdm-2.22.0/daemon/gdm-simple-slave.c
---- gdm-2.22.0/daemon/gdm-simple-slave.c.fix-autologin 2008-06-27 12:47:26.000000000 -0400
-+++ gdm-2.22.0/daemon/gdm-simple-slave.c 2008-06-27 12:54:21.000000000 -0400
+diff -up gdm-2.22.0/daemon/gdm-simple-slave.c.fix-auto-login gdm-2.22.0/daemon/gdm-simple-slave.c
+--- gdm-2.22.0/daemon/gdm-simple-slave.c.fix-auto-login 2008-06-27 12:57:23.000000000 -0400
++++ gdm-2.22.0/daemon/gdm-simple-slave.c 2008-06-27 12:57:23.000000000 -0400
@@ -427,12 +427,26 @@ get_timed_login_details (GdmSimpleSlave
gboolean res;
@@ -41,7 +21,7 @@ diff -up gdm-2.22.0/daemon/gdm-simple-slave.c.fix-autologin gdm-2.22.0/daemon/gd
+ if (enabled) {
+
+ *username = NULL;
-+ res = gdm_settings_client_get_string (GDM_KEY_TIMED_LOGIN_USER, username);
++ res = gdm_settings_client_get_string (GDM_KEY_AUTO_LOGIN_USER, username);
+ }
+
+ if (enabled && *username != NULL)
@@ -61,3 +41,43 @@ diff -up gdm-2.22.0/daemon/gdm-simple-slave.c.fix-autologin gdm-2.22.0/daemon/gd
res = gdm_settings_client_get_string (GDM_KEY_TIMED_LOGIN_USER, username);
if (username == NULL) {
+diff -up gdm-2.22.0/data/gdm.schemas.in.fix-auto-login gdm-2.22.0/data/gdm.schemas.in
+--- gdm-2.22.0/data/gdm.schemas.in.fix-auto-login 2008-06-30 10:06:29.000000000 -0400
++++ gdm-2.22.0/data/gdm.schemas.in 2008-06-30 10:06:49.000000000 -0400
+@@ -12,6 +12,16 @@
+ gdm
+
+
++ daemon/AutomaticLoginEnable
++ b
++ false
++
++
++ daemon/AutomaticLogin
++ s
++
++
++
+ daemon/TimedLoginEnable
+ b
+ false
+diff -up gdm-2.22.0/data/gdm.schemas.in.in.fix-auto-login gdm-2.22.0/data/gdm.schemas.in.in
+--- gdm-2.22.0/data/gdm.schemas.in.in.fix-auto-login 2008-04-17 23:29:29.000000000 -0400
++++ gdm-2.22.0/data/gdm.schemas.in.in 2008-06-27 12:57:23.000000000 -0400
+@@ -12,6 +12,16 @@
+ gdm
+
+
++ daemon/AutomaticLoginEnable
++ b
++ false
++
++
++ daemon/AutomaticLogin
++ s
++
++
++
+ daemon/TimedLoginEnable
+ b
+ false
diff --git a/gdm.spec b/gdm.spec
index 4a39194..9602645 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
Summary: The GNOME Display Manager
Name: gdm
Version: 2.22.0
-Release: 7%{?dist}
+Release: 8%{?dist}
Epoch: 1
License: GPLv2+
Group: User Interface/X
@@ -309,6 +309,9 @@ fi
%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
%changelog
+* Mon Jun 30 2008 Ray Strode - 1:2.22.0-8
+- Fix automatic login option fix
+
* Fri Jun 27 2008 Ray Strode - 1:2.22.0-7
- Fix automatic login option