diff -Nbur pambase-20080318.ori/system-auth.in pambase-20080318/system-auth.in
--- pambase-20080318.ori/system-auth.in	2008-03-18 22:13:31.000000000 +0100
+++ pambase-20080318/system-auth.in	2008-03-18 22:16:07.000000000 +0100
@@ -2,6 +2,9 @@
 auth		required	pam_env.so DEBUG
 #endif
 auth		required	pam_unix.so try_first_pass LIKEAUTH nullok DEBUG
+#if HAVE_GNOME_KEYRING
+auth		optional	pam_gnome_keyring.so
+#endif
  
 account		required	pam_unix.so DEBUG
  
@@ -12,6 +15,9 @@
 password	required	pam_passwdqc.so min=8,8,8,8,8 retry=3
 #endif
 password	required	pam_unix.so try_first_pass AUTHTOK nullok UNIX_EXTENDED_ENCRYPTION DEBUG
+#if HAVE_GNOME_KEYRING
+password	optional	pam_gnome_keyring.so
+#endif
  
 #if HAVE_LIMITS
 session		required	pam_limits.so DEBUG
@@ -23,4 +29,7 @@
 session		optional	pam_mktemp.so
 #endif
 session		required	pam_unix.so DEBUG
+#if HAVE_GNOME_KEYRING
+session		optional	pam_gnome_keyring.so auto_start
+#endif
  
diff -Nbur pambase-20080318.ori/system-login.in pambase-20080318/system-login.in
--- pambase-20080318.ori/system-login.in	2008-03-18 22:13:31.000000000 +0100
+++ pambase-20080318/system-login.in	2008-03-18 22:16:31.000000000 +0100
@@ -6,9 +6,6 @@
 #endif
 auth		required	pam_nologin.so DEBUG_NOLOGIN
 auth		include		system-auth
-#if HAVE_GNOME_KEYRING
-auth		optional	pam_gnome_keyring.so
-#endif
  				
 #if HAVE_ACCESS
 account		required	pam_access.so DEBUG
@@ -25,9 +22,6 @@
 #endif
  
 password	include		system-auth
-#if HAVE_GNOME_KEYRING
-password	optional	pam_gnome_keyring.so
-#endif
  
 #if HAVE_SELINUX
 session		required	pam_selinux.so close
@@ -37,9 +31,6 @@
 #endif
 session		optional	pam_lastlog.so DEBUG
 session		include		system-auth
-#if HAVE_GNOME_KEYRING
-session		optional	pam_gnome_keyring.so auto_start
-#endif
 #if HAVE_SELINUX
 session		required	pam_selinux.so multiple open
 #endif