diff --git a/modules/tools/password-store/config.el b/modules/tools/password-store/config.el
index 0bc8015db..63601a23c 100644
--- a/modules/tools/password-store/config.el
+++ b/modules/tools/password-store/config.el
@@ -29,14 +29,14 @@
         "C-k" #'pass-next-directory))
 
 
-(cond ((version< emacs-version "26")
-       ;; included with `pass'
-       (require 'auth-password-store)
-       (auth-pass-enable))
-
-      (t ;; built into Emacs 26
-       (require 'auth-store-pass)
-       (auth-source-pass-enable)))
+(cond ((package-built-in-p 'auth-store-pass) ; built into Emacs 26
+       (def-package! auth-store-pass
+         :demand t
+         :config (auth-source-pass-enable)))
+      (t
+       (def-package! auth-password-store
+         :demand t
+         :config (auth-pass-enable))))
 
 
 (def-package! helm-pass
diff --git a/modules/tools/password-store/packages.el b/modules/tools/password-store/packages.el
index 867abc793..bc068d4bb 100644
--- a/modules/tools/password-store/packages.el
+++ b/modules/tools/password-store/packages.el
@@ -4,7 +4,7 @@
 (package! pass)
 (package! password-store)
 
-(when (version< emacs-version "26")
+(unless (package-built-in-p 'auth-store-pass)
   (package! auth-password-store))
 
 (when (featurep! :completion helm)