diff --git a/sddm-autologin.pam b/sddm-autologin.pam
index c6d602b..a6272e1 100644
--- a/sddm-autologin.pam
+++ b/sddm-autologin.pam
@@ -15,4 +15,7 @@ session    required    pam_selinux.so open
 session    optional    pam_keyinit.so force revoke
 session    required    pam_namespace.so
 session    include     system-auth
+-session    optional    pam_gnome_keyring.so auto_start
+-session    optional    pam_kwallet5.so auto_start
+-session    optional    pam_kwallet.so auto_start
 session    include     postlogin
diff --git a/sddm.pam b/sddm.pam
index c6bd14d..5ce23a8 100644
--- a/sddm.pam
+++ b/sddm.pam
@@ -19,6 +19,6 @@ session     optional      pam_keyinit.so force revoke
 session     required      pam_namespace.so
 session     include       password-auth
 -session     optional      pam_gnome_keyring.so auto_start
--session     optional      pam_kwallet5.so
--session     optional      pam_kwallet.so
+-session     optional      pam_kwallet5.so auto_start
+-session     optional      pam_kwallet.so auto_start
 session     include       postlogin
diff --git a/sddm.spec b/sddm.spec
index 82a003b..2947f1b 100644
--- a/sddm.spec
+++ b/sddm.spec
@@ -2,7 +2,7 @@
 
 Name:           sddm
 Version:        0.18.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2+
 Summary:        QML based X11 desktop manager
 
@@ -210,6 +210,9 @@ exit 0
 
 
 %changelog
+* Fri May 03 2019 Rex Dieter <rdieter@fedoraproject.org> - 0.18.1-2
+- consistently use auto_start in pam config (#1706029)
+
 * Mon Apr 01 2019 Rex Dieter <rdieter@fedoraproject.org> - 0.18.1-1
 - 0.18.1