--- uip/inc.c.orig	2003-10-24 13:17:38.000000000 -0700
+++ uip/inc.c	2004-07-30 19:33:26.699430580 -0700
@@ -486,8 +486,7 @@
      * a POP server?
      */
     if (inc_type == INC_POP) {
-	if (user == NULL)
-	    user = getusername ();
+
 	if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
 	    kpop = 1;
 	}
@@ -496,6 +495,12 @@
 	else
 	    ruserpass (host, &user, &pass);
 
+	/* 
+	 * Do this _after_ ruserpass, otherwise the login field will be unusable
+	 */
+	if (user == NULL)
+	    user = getusername ();
+
 	/*
 	 * initialize POP connection
 	 */