diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index 37930122..c7de7475 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -1,19 +1,24 @@
 [personal]
-source               = notmuch://~/.mail/
-maildir-store        = ~/.mail/
-maildir-account-path = personal
-query-map            = ~/.config/aerc/personal-map.conf
-outgoing             = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025
-outgoing-cred-cmd    = pass show proton/bridge
-default              = InboxNM
-from                 = Daniel Fichtinger <daniel@ficd.ca>
-copy-to              = sent
-cache-headers        = true
-signature-file       = /home/fic/mail/daniel@ficd.ca.sig
-check-mail-cmd       = /home/fic/.config/mail/mail-sync.sh
-check-mail           = 5m
-exclude-tags         = spam,archive,deleted
-folders-sort         = InboxNM, SentNM, to-me, sr.ht, git
+source                    = notmuch://~/.mail/
+maildir-store             = ~/.mail/
+maildir-account-path      = personal
+query-map                 = ~/.config/aerc/personal-map.conf
+outgoing                  = smtp+plain://daniel%40ficd.ca@127.0.0.1:1025
+outgoing-cred-cmd         = pass show proton/bridge
+default                   = InboxNM
+from                      = Daniel Fichtinger <daniel@ficd.ca>
+copy-to                   = sent
+cache-headers             = true
+signature-file            = /home/fic/mail/daniel@ficd.ca.sig
+check-mail-cmd            = /home/fic/.config/mail/mail-sync.sh
+check-mail                = 5m
+exclude-tags              = spam,archive,deleted
+folders-sort              = InboxNM, SentNM, to-me, sr.ht, git
+pgp-auto-sign             = true
+pgp-self-encrypt          = true
+pgp-opportunistic-encrypt = false
+pgp-error-level           = warn
+pgp-key-id                = 965699C862DA92143CDE2877D1B0947B25420214
 
 [school]
 source               = notmuch://~/.mail/
diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index b2e24892..4257bc6d 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -15,6 +15,7 @@
 #
 # Default: auto
 pgp-provider=gpg
+use-terminal-pinentry = true
 
 # By default, the file permissions of accounts.conf must be restrictive and
 # only allow reading by the file owner (0600). Set this option to true to