diff --git a/.config/mbsync/config b/.config/mbsync/config
index 0e63906..244335b 100644
--- a/.config/mbsync/config
+++ b/.config/mbsync/config
@@ -3,7 +3,7 @@ IMAPStore david.julien@posteo.net-remote
 Host posteo.de
 Port 993
 User david.julien@posteo.net
-PassCmd "pass david.julien@posteo.net"
+PassCmd "pass posteo.net/david.julien"
 AuthMechs LOGIN
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
@@ -55,7 +55,7 @@ IMAPStore david.julien@mailo.com-remote
 Host mail.mailo.com
 Port 993
 User david.julien@mailo.com
-PassCmd "pass david.julien@mailo.com"
+PassCmd "pass mailo.com/david.julien"
 AuthMechs LOGIN
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
diff --git a/.config/msmtp/config b/.config/msmtp/config
index e8f6b48..1cfb35f 100644
--- a/.config/msmtp/config
+++ b/.config/msmtp/config
@@ -3,7 +3,7 @@ host posteo.de
 port 587
 from david.julien@posteo.net
 user david.julien@posteo.net
-passwordeval "pass david.julien@posteo.net"
+passwordeval "pass posteo.net/david.julien"
 auth on
 tls on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
@@ -25,7 +25,7 @@ host mail.mailo.com
 port 587
 from david.julien@mailo.com
 user david.julien@mailo.com
-passwordeval "pass david.julien@mailo.com"
+passwordeval "pass mailo.com/david.julien"
 auth on
 tls on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt