diff --git a/instfiles/pam.d/xrdp-sesman.arch b/instfiles/pam.d/xrdp-sesman.arch
index d303ab79..2763612e 100644
--- a/instfiles/pam.d/xrdp-sesman.arch
+++ b/instfiles/pam.d/xrdp-sesman.arch
@@ -1,5 +1,12 @@
 #%PAM-1.0
-auth        include     system-remote-login
-account     include     system-remote-login
-password    include     system-remote-login
-session     include     system-remote-login
+auth        include  system-remote-login
+-auth       optional pam_gnome_keyring.so
+-auth       optional pam_kwallet5.so
+
+account     include  system-remote-login
+
+password    include  system-remote-login
+
+session     include  system-remote-login
+-session    optional pam_gnome_keyring.so auto_start
+-session    optional pam_kwallet5.so auto_start
diff --git a/instfiles/pam.d/xrdp-sesman.debian b/instfiles/pam.d/xrdp-sesman.debian
index 789ce8f7..bab1e572 100644
--- a/instfiles/pam.d/xrdp-sesman.debian
+++ b/instfiles/pam.d/xrdp-sesman.debian
@@ -1,5 +1,14 @@
 #%PAM-1.0
+auth     required  pam_env.so readenv=1
+auth     required  pam_env.so readenv=1 envfile=/etc/default/locale
 @include common-auth
+-auth    optional  pam_gnome_keyring.so
+-auth    optional  pam_kwallet5.so
+
 @include common-account
-@include common-session
+
 @include common-password
+
+@include common-session
+-session optional  pam_gnome_keyring.so auto_start
+-session optional  pam_kwallet5.so auto_start