diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index a6c1de8f..07162c2c 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -21,9 +21,9 @@ pgp-opportunistic-encrypt   = false
 pgp-error-level             = warn
 pgp-key-id                  = 965699C862DA92143CDE2877D1B0947B25420214
 # Address Book
-carddav-source = https://carddav.fastmail.com/dav/addressbooks/user/daniel@ficd.ca/Default
+carddav-source = https://daniel%40ficd.ca@carddav.fastmail.com/dav/addressbooks/user/address@fastmail.com/Default
 carddav-source-cred-cmd = pass show fastmail/carddav
-address-book-cmd = carddav-query -S fastmail %s
+address-book-cmd = carddav-query -S Fastmail %s
 
 [Outlook]
 source               = imaps+xoauth2://18daf3%40queensu.ca@outlook.office365.com?token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753