diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 70547fcc2..47659cf25 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-28  Corinna Vinschen  <corinna@vinschen.de>
+
+	* uinfo.cc (pwdgrp::fetch_account_from_windows): Only fetch extended
+	user info if we're creating a passwd entry.  Add comment.
+
 2014-02-28  Corinna Vinschen  <corinna@vinschen.de>
 
 	* cygheap.h (cygheap_user::sid): Return reference to cygpsid rather
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index dc22082c1..ef8128265 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -1501,7 +1501,9 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, bool group,
 
 	  if (is_domain_account)
 	    {
-	      if (acc_type != SidTypeUser)
+	      /* We only care for the extended user information if we're
+		 creating a passwd entry and the account is, in fact, a user. */
+	      if (group || acc_type != SidTypeUser)
 		break;
 
 	      /* Default primary group.  If the sid is the current user, fetch