diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c779c9080..d0eb58d6b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 16 23:27:00 2001  Corinna Vinschen <corinna@vinschen.de>
+
+	* uinfo.cc (uinfo_init): Just set user token to INVALID_HANDLE_VALUE.
+	Token value is already invalid at that point.
+
 Wed May 16 21:34:00 2001  Fred Yankowski <fred@ontosys.com>
 
 	* net.cc (errmap): Add missing mapping from WSAEINTR to EINTR.
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index a476b73f0..aea8fece4 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -207,7 +207,7 @@ uinfo_init ()
      Setting `impersonated' to TRUE seems to be wrong but it
      isn't. Impersonated is thought as "Current User and `token'
      are coincident". See seteuid() for the mechanism behind that. */
-  cygwin_set_impersonation_token (INVALID_HANDLE_VALUE);
+  cygheap->user.token = INVALID_HANDLE_VALUE;
   cygheap->user.impersonated = TRUE;
 
   /* If uid is USHRT_MAX, the process is started from a non cygwin