diff --git a/options/custom/programs/seahorse.nix b/options/custom/programs/seahorse.nix
index 9986c6e..6844443 100644
--- a/options/custom/programs/seahorse.nix
+++ b/options/custom/programs/seahorse.nix
@@ -10,6 +10,5 @@ in {
 
   config = mkIf cfg.enable {
     programs.seahorse.enable = true;
-    services.gnome.gnome-keyring.enable = true;
   };
 }
diff --git a/options/custom/services/gnome-keyring.nix b/options/custom/services/gnome-keyring.nix
index d28d4a6..d648bfe 100644
--- a/options/custom/services/gnome-keyring.nix
+++ b/options/custom/services/gnome-keyring.nix
@@ -8,9 +8,10 @@ with lib; let
 in {
   options.custom.services.gnome-keyring.enable = mkOption {default = false;};
 
-  config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
+  config = mkIf cfg.enable {
     # https://wiki.archlinux.org/title/GNOME/Keyring
     # https://gitlab.gnome.org/GNOME/gnome-keyring
-    services.gnome-keyring.enable = true;
+    services.gnome.gnome-keyring.enable = true;
+    home-manager.users.${config.custom.username}.services.gnome-keyring.enable = true;
   };
 }
diff --git a/options/custom/services/greetd.nix b/options/custom/services/greetd.nix
index 7e32387..242a83a 100644
--- a/options/custom/services/greetd.nix
+++ b/options/custom/services/greetd.nix
@@ -33,6 +33,9 @@ in {
       };
     };
 
+    # Use password at login to unlock keyring
+    security.pam.services.greetd.fprintAuth = false;
+
     # Attempt to prevent bootlogs from polluting the tty
     # https://github.com/apognu/tuigreet/issues/68
     systemd.services.greetd.serviceConfig = {
@@ -44,8 +47,5 @@ in {
       TTYVHangup = true;
       TTYVTDisallocate = true;
     };
-
-    # FIXME: Does not unlock at login
-    security.pam.services.greetd.enableGnomeKeyring = true; # Allow PAM unlocking
   };
 }