diff --git a/users/simon/modules/mail/aerc/default.nix b/users/simon/modules/mail/aerc/default.nix
index b3d1dec..aedfbdf 100644
--- a/users/simon/modules/mail/aerc/default.nix
+++ b/users/simon/modules/mail/aerc/default.nix
@@ -25,13 +25,13 @@ in
           source =
             if notmuch.enable
             then "notmuch://${config.accounts.email.maildirBasePath}"
-            else "`imap://${quoteMailAddress address}@${imap.host}`";
+            else "`imap://${quoteMailAddress userName}@${imap.host}`";
           source-cred-cmd = "`${lib.concatStringsSep " " passwordCommand}`";
           # TODO: remove when copy-to is implemented in aerc for notmuch
           outgoing =
             if notmuch.enable
             then "${./msmtp-wrapper} ${name}"
-            else "`smtp+plain://${quoteMailAddress address}@${smtp.host}`";
+            else "`smtp+plain://${quoteMailAddress userName}@${smtp.host}`";
           outgoing-cred-cmd = "`${lib.concatStringsSep " " passwordCommand}`";
           from = "${realName} <${address}>";
           smtp-starttls = if smtp.tls.useStartTls then "yes" else "no";