+++ qpopper3/popper/pop_user.c	Tue Dec  7 23:23:26 1999
@@ -69,6 +69,8 @@
     int         i;
 # endif
 
+    char *at_sign;
+
     /* Downcase user name if requested */
     if (p->downcase_user)
         downcase_uname (p, p->pop_parm[1]);
@@ -98,6 +100,13 @@
       }
       (void)strncpy(p->user, p->pop_parm[1], user_name_len);
       p->user[sizeof(p->user)-1] = 0;
+
+
+      if(at_sign = index(p->user, '@'))
+      {
+        *at_sign = 0;
+      }
+
       strcpy( p->authid, p->user );  /* userid is also authentication id */
     }