diff --git a/recipes-support/greetd/greetd/greetd.pam b/recipes-support/greetd/greetd/greetd.pam
index b88c2b3..08ce72b 100644
--- a/recipes-support/greetd/greetd/greetd.pam
+++ b/recipes-support/greetd/greetd/greetd.pam
@@ -1,9 +1,11 @@
 #%PAM-1.0
-auth     requisite      pam_nologin.so
-auth     include        common-auth
-account  include        common-account
-password include        common-password
-session  required       pam_loginuid.so
-session  optional       pam_keyinit.so force revoke
-session  include        common-session
-
+auth requisite pam_nologin.so
+auth include common-auth
+auth required pam_env.so
+auth optional pam_gnome_keyring.so
+account include common-account
+password include common-password
+session required pam_loginuid.so
+session optional pam_keyinit.so force revoke
+session include common-session
+session optional pam_gnome_keyring.so auto_start
diff --git a/recipes-support/greetd/greetd_git.bb b/recipes-support/greetd/greetd_git.bb
index 496bcea..7695e3c 100644
--- a/recipes-support/greetd/greetd_git.bb
+++ b/recipes-support/greetd/greetd_git.bb
@@ -154,7 +154,7 @@ do_install:append() {
 }
 
 USERADD_PACKAGES = "${PN}"
-USERADD_PARAM:${PN} = "--system --user-group --groups video --no-create-home --shell /bin/bash greeter"
+USERADD_PARAM:${PN} = "--system --user-group --groups video --no-create-home --shell /bin/sh greeter"
 
 FILES:${PN} += "${sysconfdir} ${systemd_system_unitdir}"