diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3352e8f8b..115d6a3f1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -14,6 +14,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o pop3: Fixed the issue of having to supply the user name for all requests
  o 
 
 This release includes the following known bugs:
diff --git a/lib/pop3.c b/lib/pop3.c
index 579e77bb5..64efb255f 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -305,12 +305,20 @@ static void state(struct connectdata *conn, pop3state newstate)
 
 static CURLcode pop3_state_auth(struct connectdata *conn)
 {
-  CURLcode result;
+  CURLcode result = CURLE_OK;
   struct pop3_conn *pop3c = &conn->proto.pop3c;
 
   pop3c->authmechs = 0;         /* No known authentication mechanisms yet */
   pop3c->authused = 0;          /* Clear the authentication mechanism used */
 
+  /* Check we have a username and password to authenticate with and end the
+     connect phase if we don't */
+  if(!conn->bits.user_passwd) {
+    state(conn, SMTP_STOP);
+
+    return result;
+  }
+
   /* send AUTH */
   result = Curl_pp_sendf(&pop3c->pp, "AUTH");