diff -Nbur pam.d/system-auth /etc/pam.d/system-auth
--- pam.d/system-auth	2008-03-18 22:05:12.000000000 +0100
+++ /etc/pam.d/system-auth	2008-03-18 22:06:41.000000000 +0100
@@ -1,12 +1,15 @@
 auth		required	pam_env.so 
 auth		required	pam_unix.so try_first_pass likeauth nullok 
+auth		optional	pam_gnome_keyring.so
  
 account		required	pam_unix.so 
  
 password	required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 try_first_pass retry=3 
 password	required	pam_unix.so try_first_pass use_authtok nullok md5 shadow 
+password	optional	pam_gnome_keyring.so
  
 session		required	pam_limits.so 
 session		required	pam_env.so 
 session		required	pam_unix.so 
+session		optional	pam_gnome_keyring.so auto_start
  
diff -Nbur pam.d/system-login /etc/pam.d/system-login
--- pam.d/system-login	2008-03-18 22:05:12.000000000 +0100
+++ /etc/pam.d/system-login	2008-03-18 22:06:36.000000000 +0100
@@ -2,7 +2,6 @@
 auth		required	pam_shells.so 
 auth		required	pam_nologin.so 
 auth		include		system-auth
-auth		optional	pam_gnome_keyring.so
  				
 account		required	pam_access.so 
 account		required	pam_nologin.so 
@@ -10,12 +9,10 @@
 account		required	pam_tally.so file=/var/log/faillog onerr=succeed 
  
 password	include		system-auth
-password	optional	pam_gnome_keyring.so
  
 session		required	pam_env.so 
 session		optional	pam_lastlog.so silent
 session		include		system-auth
-session		optional	pam_gnome_keyring.so auto_start
 session		optional	pam_motd.so motd=/etc/motd
 session		optional	pam_mail.so