1 files changed, 11 insertions, 4 deletions

diff --git a/pop3.c b/pop3.c
index 2c5ad87e..7a9c3ccc 100644
--- a/pop3.c
+++ b/pop3.c
@@ -104,10 +104,17 @@ char *greeting;
 	if (pop3_ok(buf,socket) != 0)
 	    goto badAuth;
 
-	if (queryctl->rpopid[0])
-	    gen_send(socket, "RPOP %s", queryctl->rpopid);
-	else
-	    gen_send(socket, "PASS %s", queryctl->password);
+	gen_send(socket, "PASS %s", queryctl->password);
+	if (pop3_ok(buf,socket) != 0)
+	    goto badAuth;
+	break;
+
+    case P_RPOP:
+	gen_send(socket,"USER %s", queryctl->remotename);
+	if (pop3_ok(buf,socket) != 0)
+	    goto badAuth;
+
+	gen_send(socket, "RPOP %s", queryctl->password);
 	if (pop3_ok(buf,socket) != 0)
 	    goto badAuth;
 	break;