diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index e103e633..a6c1de8f 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -16,12 +16,12 @@ aliases = Daniel Fichtinger <notdaf@ficcdaf.ca>, Daniel Fichtinger <*@ficd.ca>,
 use-envelope-from = true
 pgp-auto-sign               = true
 pgp-self-encrypt            = true
-pgp-attach-key              = true
+pgp-attach-key              = false
 pgp-opportunistic-encrypt   = false
 pgp-error-level             = warn
 pgp-key-id                  = 965699C862DA92143CDE2877D1B0947B25420214
 # Address Book
-carddav-source = https://daniel%40ficd.ca@carddav.fastmail.com/dav/addressbooks/user/address@fastmail.com/Default
+carddav-source = https://carddav.fastmail.com/dav/addressbooks/user/daniel@ficd.ca/Default
 carddav-source-cred-cmd = pass show fastmail/carddav
 address-book-cmd = carddav-query -S fastmail %s