diff --git a/res/pam.d/ly b/res/pam.d/ly
index 781605e..1f89dc7 100644
--- a/res/pam.d/ly
+++ b/res/pam.d/ly
@@ -1,21 +1,16 @@
 #%PAM-1.0
 
-# Unlock GNOME Keyring
--auth      optional     pam_gnome_keyring.so
--session   optional     pam_gnome_keyring.so auto_start
-
-# Unlock KWallet
--auth      optional     pam_kwallet5.so
--session   optional     pam_kwallet5.so      auto_start
-
-# Integrate with systemd-logind
--session   optional     pam_systemd.so       class=greeter
-
-# Integrate with elogind
--session   optional     pam_elogind.so
-
-# Include system defaults
 auth       include      login
+-auth      optional     pam_gnome_keyring.so
+-auth      optional     pam_kwallet5.so
+
 account    include      login
+
 password   include      login
+-password  optional     pam_gnome_keyring.so use_authtok
+
 session    include      login
+-session   optional     pam_gnome_keyring.so auto_start
+-session   optional     pam_kwallet5.so      auto_start
+-session   optional     pam_systemd.so       class=greeter
+-session   optional     pam_elogind.so