diff --git a/users/jan/default.nix b/users/jan/default.nix
index 117490c..d499657 100644
--- a/users/jan/default.nix
+++ b/users/jan/default.nix
@@ -60,9 +60,6 @@
 
     local.shell.enable = true;
 
-    home.sessionVariables = lib.mkIf config.local.programs.pass.enable {
-      PASSWORD_STORE_DIR = "${config.home-manager.users.jan.xdg.dataHome}/pass/store";
-    };
 
     ################################################################################
     # Programs
@@ -124,7 +121,13 @@
       };
     };
 
-    services.pass-secret-service.enable = config.local.programs.pass.enable;
+    services.pass-secret-service = lib.mkIf config.local.programs.pass.enable {
+      enable = true;
+      storePath = config.home-manager.users.jan.home.sessionVariables.PASSWORD_STORE_DIR;
+    };
+    home.sessionVariables = lib.mkIf config.local.programs.pass.enable {
+      PASSWORD_STORE_DIR = "${config.home-manager.users.jan.xdg.dataHome}/pass/store";
+    };
 
     ################################################################################
     # Packages