diff --git a/flake.nix b/flake.nix
index f7ef7f8..fe19135 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,6 +53,7 @@
                 backupFileExtension = "backup";
                 extraSpecialArgs = {
                   inherit userName;
+                  inherit hostName;
                 };
                 useGlobalPkgs = true;
                 useUserPackages = true;
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index e7f3270..975855a 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -14,6 +14,8 @@
 
   # config
 
+  age.secrets."protonmail-desktop-password".file = ../../secrets/protonmail-desktop-password.age;
+
   home = {
     username = "${userName}";
     homeDirectory = "/home/will";
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 4d0e134..50f5ec5 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -14,6 +14,8 @@
 
   # config
 
+  age.secrets."protonmail-laptop-password".file = ../../secrets/protonmail-laptop-password.age;
+
   home = {
     username = "${userName}";
     homeDirectory = "/home/will";
diff --git a/modules/home-manager/features/mail.nix b/modules/home-manager/features/mail.nix
index 1d33028..fac8d65 100644
--- a/modules/home-manager/features/mail.nix
+++ b/modules/home-manager/features/mail.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  hostName,
   ...
 }:
 let
@@ -41,7 +42,7 @@ in
                 inherit host;
               };
               inherit address;
-              passwordCommand = "cat ${config.age.secrets.protonmail-password.path}";
+              passwordCommand = "cat ${config.age.secrets."protonmail-${hostName}-password".path}";
               primary = true;
               realName = "Will Holdsworth";
               smtp = {
@@ -55,13 +56,7 @@ in
             };
           };
       };
-
-    age.secrets = {
-      # keep-sorted start
-      "protonmail-cert".file = ../../../secrets/protonmail-cert.age;
-      "protonmail-password".file = ../../../secrets/protonmail-password.age;
-      # keep-sorted end
-    };
+    age.secrets."protonmail-cert".file = ../../../secrets/protonmail-cert.age;
   };
 
   imports = [ ];
diff --git a/secrets/protonmail-desktop-password.age b/secrets/protonmail-desktop-password.age
new file mode 100644
index 0000000..7cfb4a5
--- /dev/null
+++ b/secrets/protonmail-desktop-password.age
@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 qLT+DQ 5SwQDhD4kh5rf8gOIf5OAXsipUjguakuW8YiaWeniVU
+ZbivA9gOXebUmHLnIjDe7mBGe6RSwLSxiZdsqwGe8Y0
+-> ssh-ed25519 7+xRyQ EmyQt5Mo21YDxnAAdMW1ehlzSX8/KfWmvsyJ5F+4eVg
+aanR02UNI2qHpFsBm18G71vfZusybejGc1xLBoQz/2c
+-> ssh-ed25519 LtK9yQ 0No7c3518Q2JRALb5XTl/ZjNiEgWEiQz1k/hfSR0vyM
+z/OHVmjTaVXcCsDSeWIsRCmwIbPnkj9K4/bEME3aEjE
+--- DtxdciZ6fWb30GyGn0/mqtsXOmiyOQupeSoe8tOIx6g
+�h�ya��Yc�0��>�h������Y{�;*�.�V6u@�4&��"����@
\ No newline at end of file
diff --git a/secrets/protonmail-password.age b/secrets/protonmail-laptop-password.age
similarity index 100%
rename from secrets/protonmail-password.age
rename to secrets/protonmail-laptop-password.age
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 4186baa..69b1be1 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -25,7 +25,8 @@ in
   "paperless.age".publicKeys = users;
   "porkbun-api.age".publicKeys = users;
   "protonmail-cert.age".publicKeys = users;
-  "protonmail-password.age".publicKeys = users;
+  "protonmail-desktop-password.age".publicKeys = users;
+  "protonmail-laptop-password.age".publicKeys = users;
   "prowlarr.age".publicKeys = users;
   "radarr.age".publicKeys = users;
   "radicale.age".publicKeys = users;