diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 43bbbc1ae..414e14827 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-30  Corinna Vinschen  <corinna@vinschen.de>
+
+	* security.cc (convert_samba_sd): Fix accidental dropping of all
+	non-Unix User, non-Unix Group accounts.
+
 2015-04-27  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/asm/types.h: Add __s64 and __u64 types.
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc
index 1bc0c5047..86ebe2c0a 100644
--- a/winsup/cygwin/security.cc
+++ b/winsup/cygwin/security.cc
@@ -1145,10 +1145,10 @@ convert_samba_sd (security_descriptor &sd_ret)
 		if (gid < UNIX_POSIX_OFFSET && (grp = internal_getgrgid (gid)))
 		  ace_sid.getfromgr (grp);
 	      }
-	    if (!add_access_allowed_ace (acl, i, ace->Mask, ace_sid, acl_len,
-					 ace->Header.AceFlags))
-	      return;
 	  }
+	if (!add_access_allowed_ace (acl, i, ace->Mask, ace_sid, acl_len,
+				     ace->Header.AceFlags))
+	  return;
       }
   acl->AclSize = acl_len;