diff --git a/hosts/pi4/forgejo.nix b/hosts/pi4/forgejo.nix
index 8515a84..dba91a7 100644
--- a/hosts/pi4/forgejo.nix
+++ b/hosts/pi4/forgejo.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  systemConfig,
   common,
   ...
 }:
@@ -26,6 +27,9 @@ in
       database.type = "postgres";
       # Enable support for Git Large File Storage
       lfs.enable = true;
+
+      secrets.mailer.PASSWD = config.sops.secrets."mailserver/password-hash".path;
+
       settings = {
         server = {
           DOMAIN = domain;
@@ -48,10 +52,9 @@ in
           PROTOCOL = "smtps";
           SMTP_ADDR = config.mailserver.fqdn;
           FROM = "noreply-forgejo@${common.domain}";
-          USER = "noreply@${common.domain}";
+          USER = "${systemConfig.username}@${common.domain}";
         };
       };
-      #mailerPasswordFile = config.sops.secrets."forgejo/mailer-password".path;
     };
     gitea-actions-runner = {
       package = pkgs.forgejo-actions-runner;