diff --git a/libbalsa/imap/pop3.c b/libbalsa/imap/pop3.c
index fb74863..8955b7e 100644
--- a/libbalsa/imap/pop3.c
+++ b/libbalsa/imap/pop3.c
@@ -226,6 +226,9 @@ pop_get_capa(PopHandle *pop, GError **err)
   char *line;
 
   memset(pop->capabilities, '\0', sizeof(pop->capabilities));
+  if (pop->disable_apop != 0) {
+    pop->capabilities[POP_CAP_USER] = 1;
+  }
   if(!pop_exec(pop, "CAPA\r\n", err)) {
     pop->capabilities[POP_CAP_USER] = 1;
     return FALSE;