diff --git a/appl/popper/pop_get_command.c b/appl/popper/pop_get_command.c
index d10e4dc54..d4ac45b6b 100644
--- a/appl/popper/pop_get_command.c
+++ b/appl/popper/pop_get_command.c
@@ -18,6 +18,9 @@ static state_table states[] = {
 #ifdef RPOP
         {auth2,  "rpop", 1,  1,  pop_rpop,   {auth1, trans}},
 #endif /* RPOP */
+#ifdef SASL
+	{auth1,  "auth", 1,  2,  pop_auth,   {auth1, trans}},
+#endif
         {auth1,  "quit", 0,  0,  pop_quit,   {halt,  halt}},
         {auth2,  "quit", 0,  0,  pop_quit,   {halt,  halt}},
 #ifdef CAPA
@@ -52,11 +55,15 @@ pop_capa (POP *p)
 {
     /*  Search for the POP command in the command/state table */
     pop_msg (p,POP_SUCCESS, "Capability list follows");
-    fprintf(p->output, "USER\r\n");
+    if(p->auth_level == AUTH_NONE || p->auth_level == AUTH_OTP)
+	fprintf(p->output, "USER\r\n");
     fprintf(p->output, "TOP\r\n");
     fprintf(p->output, "PIPELINING\r\n");
     fprintf(p->output, "EXPIRE NEVER\r\n");
     fprintf(p->output, "RESP-CODES\r\n");
+#ifdef SASL
+    pop_capa_sasl(p);
+#endif
 #ifdef UIDL
     fprintf(p->output, "UIDL\r\n");
 #endif