diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb6418cb..60fb6f2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * webapps/nextcloud: fix misplaced gid attribute
 * webapps/nextcloud: fix missing gid
 * check stat.exists before stat.isdir
+* certbot: Fix hook for dovecot when more than one certificate is used (eg. different certificates for POP3 and IMAP)
 
 ### Removed
 
diff --git a/certbot/files/hooks/deploy/dovecot.sh b/certbot/files/hooks/deploy/dovecot.sh
index 56e5b5ae..1ed4ab5d 100644
--- a/certbot/files/hooks/deploy/dovecot.sh
+++ b/certbot/files/hooks/deploy/dovecot.sh
@@ -16,7 +16,7 @@ config_check() {
     ${doveconf_bin} > /dev/null 2>&1
 }
 letsencrypt_used() {
-    ${doveconf_bin} | grep -E "^ssl_cert[^_]" | grep -q "letsencrypt"
+    ${doveconf_bin} | grep -E "^[[:blank:]]*ssl_cert[^_]" | grep -q "letsencrypt"
 }
 main() {
     if daemon_found_and_running; then