diff --git a/common/constants.nix b/common/constants.nix
index c0f23e4..8fb31a3 100644
--- a/common/constants.nix
+++ b/common/constants.nix
@@ -52,7 +52,7 @@ with lib; {
     };
     postMaster = mkOption {
       type = types.str;
-      default = "trivial@${config.constants.domain}";
+      default = "${config.constants.userName}@${config.constants.domain}";
       description = ''
         The post master email address.
       '';
diff --git a/linux/singularity/mailserver.nix b/linux/singularity/mailserver.nix
index ddcadd1..efa0e56 100644
--- a/linux/singularity/mailserver.nix
+++ b/linux/singularity/mailserver.nix
@@ -9,8 +9,8 @@ in {
     domains = [domain];
 
     loginAccounts = {
-      "${userName}@${domain}" = {
-        aliases = [postMaster];
+      "${postMaster}" = {
+        aliases = ["trivial@${domain}"];
         hashedPasswordFile = config.sops.secrets.${userSecret}.path;
       };
       ${config.services.vaultwarden.config.SMTP_FROM}.hashedPasswordFile = config.sops.secrets.${vaultwardenSecret}.path;