diff --git a/files/etc/pam.d/login b/files/etc/pam.d/login
index aaa56c2..3bcc0cb 100644
--- a/files/etc/pam.d/login
+++ b/files/etc/pam.d/login
@@ -2,8 +2,8 @@
 
 auth    required  pam_securetty.so
 auth    requisite pam_nologin.so
-auth    optional  pam_gnome_keyring.so
 auth    include   system-local-login
+auth    optional  pam_gnome_keyring.so
 account include   system-local-login
 session include   system-local-login
 session optional  pam_gnome_keyring.so auto_start
diff --git a/files/etc/pam.d/passwd b/files/etc/pam.d/passwd
new file mode 100644
index 0000000..01b456b
--- /dev/null
+++ b/files/etc/pam.d/passwd
@@ -0,0 +1,2 @@
+password	required	pam_unix.so	sha512 shadow nullok
+password	optional	pam_gnome_keyring.so