diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b2aca3388..bb9de43bf 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,13 @@
+2014-04-22  Corinna Vinschen  <corinna@vinschen.de>
+
+	* ldap.cc (user_attr): Remove "uid" attribute.
+	* ldap.h (LDAP_USER_NAME_ATTR): Remove.  Change other attribute index
+	values as required.
+	(cyg_ldap::get_user_name): Remove inline function.
+	* uinfo.cc (pwdgrp::fetch_account_from_windows): Remove code to handle
+	Cygwin username different from Windows username.
+	(pwdgrp::add_account_from_cygserver): Remove unnecessary cast.
+
 2014-04-18  Corinna Vinschen  <corinna@vinschen.de>
 
 	* winf.cc (linebuf::fromargv): Temporarily revert patch from 2014-01-24.
diff --git a/winsup/cygwin/ldap.cc b/winsup/cygwin/ldap.cc
index a4a96f92a..8fde7c133 100644
--- a/winsup/cygwin/ldap.cc
+++ b/winsup/cygwin/ldap.cc
@@ -33,7 +33,6 @@ static PWCHAR rootdse_attr[] =
 
 static PWCHAR user_attr[] =
 {
-  (PWCHAR) L"uid",
   (PWCHAR) L"primaryGroupID",
   (PWCHAR) L"gecos",
   (PWCHAR) L"unixHomeDirectory",
diff --git a/winsup/cygwin/ldap.h b/winsup/cygwin/ldap.h
index bd23b8658..9d8a40346 100644
--- a/winsup/cygwin/ldap.h
+++ b/winsup/cygwin/ldap.h
@@ -17,12 +17,11 @@ details. */
 #include <ntldap.h>
 #pragma pop_macro ("DECLSPEC_IMPORT")
 
-#define LDAP_USER_NAME_ATTR		0
-#define LDAP_USER_PGRP_ATTR		1
-#define LDAP_USER_GECOS_ATTR		2
-#define LDAP_USER_HOME_ATTR		3
-#define LDAP_USER_SHELL_ATTR		4
-#define LDAP_USER_UID_ATTR		5
+#define LDAP_USER_PGRP_ATTR		0
+#define LDAP_USER_GECOS_ATTR		1
+#define LDAP_USER_HOME_ATTR		2
+#define LDAP_USER_SHELL_ATTR		3
+#define LDAP_USER_UID_ATTR		4
 
 #define LDAP_GROUP_NAME_ATTR		0
 #define LDAP_GROUP_GID_ATTR		1
@@ -58,7 +57,6 @@ public:
   uint32_t fetch_posix_offset_for_domain (PCWSTR domain);
   uid_t remap_uid (uid_t uid);
   gid_t remap_gid (gid_t gid);
-  PWCHAR get_user_name () { return get_string_attribute (LDAP_USER_NAME_ATTR); }
   /* User only */
   gid_t get_primary_gid () { return get_num_attribute (LDAP_USER_PGRP_ATTR); }
   PWCHAR get_gecos () { return get_string_attribute (LDAP_USER_GECOS_ATTR); }
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index a7a0fdfc3..10716a3cd 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -1187,7 +1187,6 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
   bool is_domain_account = true;
   PCWSTR domain = NULL;
   PWCHAR shell = NULL;
-  PWCHAR user = NULL;
   PWCHAR home = NULL;
   PWCHAR gecos = NULL;
   /* Temporary stuff. */
@@ -1504,10 +1503,6 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
 
 		  if ((id_val = cldap->get_primary_gid ()) != ILLEGAL_GID)
 		    gid = posix_offset + id_val;
-		  if ((val = cldap->get_user_name ())
-		      && wcscmp (name, val))
-		    user = wcscpy ((PWCHAR) alloca ((wcslen (val) + 1)
-				   * sizeof (WCHAR)), val);
 		  if ((val = cldap->get_gecos ()))
 		    gecos = wcscpy ((PWCHAR) alloca ((wcslen (val) + 1)
 				    * sizeof (WCHAR)), val);
@@ -1544,7 +1539,6 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
 		PWCHAR *tgt;
 		bool group;
 	      } search[] = {
-		{ L"name=\"", 6, &user, true },
 		{ L"unix=\"", 6, &uxid, true },
 		{ L"home=\"", 6, &home, false },
 		{ L"shell=\"", 7, &shell, false },
@@ -1780,10 +1774,10 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
   if (gid == ILLEGAL_GID)
     gid = uid;
   if (name_style >= fully_qualified)
-    p = wcpcpy (p, user ? is_group () ? L"Posix_Group" : L"Posix_User" : dom);
+    p = wcpcpy (p, dom);
   if (name_style >= plus_prepended)
     p = wcpcpy (p, cygheap->pg.nss_separator ());
-  wcpcpy (p, user ?: name);
+  wcpcpy (p, name);
 
   if (is_group ())
     __small_swprintf (linebuf, L"%W:%W:%u:",
@@ -1800,7 +1794,7 @@ pwdgrp::fetch_account_from_windows (fetch_user_arg_t &arg, cyg_ldap *pldap)
 		      gecos ?: L"", gecos ? L"," : L"",
 		      dom, name,
 		      sid.string (sidstr),
-		      home ? L"" : L"/home/", home ?: user ?: name,
+		      home ? L"" : L"/home/", home ?: name,
 		      shell ?: L"/bin/bash");
   sys_wcstombs_alloc (&line, HEAP_BUF, linebuf);
   debug_printf ("line: <%s>", line);
@@ -1860,7 +1854,7 @@ pwdgrp::add_account_from_cygserver (cygpsid &sid)
   arg.type = SID_arg;
   arg.sid = &sid;
   char *line = fetch_account_from_cygserver (arg);
-  return (struct passwd *) add_account_post_fetch (line, true);
+  return add_account_post_fetch (line, true);
 }
 
 void *
@@ -1870,7 +1864,7 @@ pwdgrp::add_account_from_cygserver (const char *name)
   arg.type = NAME_arg;
   arg.name = name;
   char *line = fetch_account_from_cygserver (arg);
-  return (struct passwd *) add_account_post_fetch (line, true);
+  return add_account_post_fetch (line, true);
 }
 
 void *
@@ -1880,5 +1874,5 @@ pwdgrp::add_account_from_cygserver (uint32_t id)
   arg.type = ID_arg;
   arg.id = id;
   char *line = fetch_account_from_cygserver (arg);
-  return (struct passwd *) add_account_post_fetch (line, true);
+  return add_account_post_fetch (line, true);
 }