diff --git a/config/mail/default.nix b/config/mail/default.nix
index 26ddf50..3c27f4f 100644
--- a/config/mail/default.nix
+++ b/config/mail/default.nix
@@ -44,10 +44,9 @@ in {
     };
 
     loginAccounts = {
-      "contact@${mailDomain}" = {
-        hashedPasswordFile = config.sops.secrets."mailserver/contact".path;
+      "root@${mailDomain}" = {
+        hashedPasswordFile = config.sops.secrets."mailserver/root".path;
         aliases = [
-          "root@${mailDomain}"
           "postmaster@${mailDomain}"
           "security@${mailDomain}"
           "abuse@${mailDomain}"
@@ -57,6 +56,10 @@ in {
           "support@${mailDomain}"
         ];
       };
+      "contact@${mailDomain}" = {
+        hashedPasswordFile = config.sops.secrets."mailserver/contact".path;
+        catchAll = [mailDomain];
+      };
     };
     certificateScheme = "acme";
   };
diff --git a/secrets.yaml b/secrets.yaml
index 1e82c00..c24e2e9 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -3,6 +3,7 @@ ssh:
         owner: ENC[AES256_GCM,data:LqatOCIAcAvYF354I5itm/rAp5S8UdyONgtK/CEvUq66isiqp+QhV3L1WiW10R8OOm4+nD70uzu4hMnSVxGfNPd8ysE7PUoTGstNFf06uwDtbRiVkJ8=,iv:LW2LwZexi/WliJ7zsoWG0nUSjk2rk5y5++LFI80qLBQ=,tag:3MpE+WVLtMwl8XeFno5FBQ==,type:str]
         nix-deploy: ENC[AES256_GCM,data:zPNvcKrGwsBJUPeYUhGVB9jPsqxG0Wo5G1hj+iwu34u12Egq1w8MYLF/kOj8XN7OOtcNmN2sr09EaD/a70gIltSeNVmEJh8u+kIehFp2UC5IKYJ5FHlGJP8+BQ==,iv:t93JWiWsdi3ihxfI6zvt4KJbywvNw2IyIWeKu+KspX8=,tag:XhD3LD8DXFAEWZXt34MC+g==,type:str]
 mailserver:
+    root: ENC[AES256_GCM,data:Csr3k2Vku2uJSeUidtGNmA5sfntg4GN0JicFG5xF3dIlx89QD1zjf7pugUoae/z7LSM66jWhL0ggXoPv,iv:J/ROA+fbh02S2wYdD/lMYbNVxTMqTVMAOm0YDq8vDKo=,tag:5DZzMWAJXq+kBGLSPeDKtQ==,type:str]
     contact: ENC[AES256_GCM,data:VjQfXiEzvBrIeLwLtS2UPjG/fAICk3hUtFPRKHN+v7cd8aSc45u90Ho3uKyKvnIaVyfoRwN21NvK4Vbb,iv:VJbxNwzipmV2yIruBsHX4z/FNy+AJq8Xp97bw/Bogpc=,tag:bc3BwY4xQNmQbQZpIEynYQ==,type:str]
     forgejo: ENC[AES256_GCM,data:7bZQ5+WET1aAFXO2+R9kt9aA2PpEqhDaj9IE1t4UEgGNzn5D+tRsh+YEI73PPTRmjH7p8HKoo/eutVj3,iv:FD+gjIz5/o1sZGWRMMQEzoX09UJD8Ptk37GuMGcnB7o=,tag:6syos0wvs2e98JNyIoFHsg==,type:str]
 radicale: ENC[AES256_GCM,data:giSJzUrRIv/D36RhaXLKDeUvxEhuduhNInTmliv+2l054PCCscMc2fos8JupL5hIFDopxvxxt4gYG397je67XKR6wfsAEtK/ZjLIRhmq0eIi9HKMal5za2fsnhrvOJD/7ES/igV25tyZFqIozbqCKNDxxapzen3ZUF7vF3QhI80i/mXrOp+QKxP5,iv:+07j221b4ISYpXT95JOy+k3J0uLFxeBr0/v0UJ5zmvU=,tag:8HAmMF+1uJTSiy2DCrkuUA==,type:str]
@@ -24,7 +25,7 @@ sops:
             L0NsZWFmd3UwblExc3UrVVVraHVTTm8KyUN1t1NgQG8+zHViKXT4fwnuFBVgzhYw
             WbCHfzut3a55ta1B50hQGFlPcUZDPImUg4wKmkdc7vurg02vOTgwUQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-01-28T17:33:24Z"
-    mac: ENC[AES256_GCM,data:pNG5CoNU5ThwgP+QALVox0H9Sf7wQALA/I6rnXUJvacajxA9eB2fR8Fp1o4C6OoNZ+o69RgRuLdj781E0D//Ww5SaVTr/QneqxzJeViJaMA/iDWZ0XQC6MiHEfeYeCCIywRm62VuYcwswrqIi2Z+gxiNBQgkXeO+xAMJfOCKXfo=,iv:1/F6PFnEghjz0dvcsELLEnoDV6pd5x2rbzJ/P3P4JfY=,tag:2ViRK4b5Puei//LY17lmAQ==,type:str]
+    lastmodified: "2026-01-28T23:12:22Z"
+    mac: ENC[AES256_GCM,data:k189xMQNsKRaEAwfjyCk502rQcA7CAZXbFORuIdYPMtVSCQLWTSAXKOzVpmYA8UuSuOXMuF4DvCmT89DS9k40zf8kyIPxevgfjPdTu+UI1KMpv0VInJOqLf70RWwgNKtiYSE0SjA4HQtdVCWUXCN2G22/RJcegpguod+TteaRv0=,iv:9vryV45opu1+tMWwv2Wq829nasrFb1nJdAvRBfF9mls=,tag:qM8KjK0/rQGbhRBB+cLekA==,type:str]
     unencrypted_suffix: _unencrypted
     version: 3.11.0