diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 53caea2ff..8c00bd34b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-25  Pierre Humblet <pierre.humblet@ieee.org>
+
+	* passwd.cc (read_etc_passwd): Never add an entry when starting
+	on Win95/98/ME if a default entry is present.
+	* uinfo.cc (internal_getlogin): Look for the default uid if needed.
+	Always call user.set_name ().
+
 2002-11-25  Corinna Vinschen  <corinna@vinschen.de>
 
 	* sec_acl.cc (getacl): Set errno to ENOSPC if command is GETACL and
diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc
index ae962822f..3677f8d13 100644
--- a/winsup/cygwin/passwd.cc
+++ b/winsup/cygwin/passwd.cc
@@ -198,6 +198,8 @@ read_etc_passwd ()
 	      && (searchentry = !internal_getpwsid (tu)))
 	    default_uid = DEFAULT_UID_NT;
 	}
+      else if (myself->uid == ILLEGAL_UID)
+        searchentry = !search_for (DEFAULT_UID, NULL);
       if (searchentry &&
 	  (!(pw = search_for (0, cygheap->user.name ())) ||
 	   (myself->uid != ILLEGAL_UID &&
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index f445649b6..8dec58e66 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -61,20 +61,21 @@ internal_getlogin (cygheap_user &user)
 	 from the Windows user name */
       if (ret)
 	{
-	  if ((pw = internal_getpwsid (tu)))
-	    user.set_name (pw->pw_name);
+	  pw = internal_getpwsid (tu);
 	  /* Set token owner to the same value as token user */
 	  if (!SetTokenInformation (ptok, TokenOwner, &tu, sizeof tu))
 	    debug_printf ("SetTokenInformation(TokenOwner): %E");
 	 }
     }
 
-  if (!pw && !(pw = getpwnam (user.name ())))
-    debug_printf("user name not found in augmented /etc/passwd");
+  if (!pw && !(pw = getpwnam (user.name ()))
+      && !(pw = getpwuid32 (DEFAULT_UID)))
+    debug_printf("user not found in augmented /etc/passwd");
   else
     {
       myself->uid = pw->pw_uid;
       myself->gid = pw->pw_gid;
+      user.set_name (pw->pw_name);
       if (wincap.has_security ())
         {
 	  cygsid gsid;