diff --git a/.cvsignore b/.cvsignore
index 7ba2235..b928490 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -17,3 +17,4 @@ doit
 idx2ldif
 ldap-capture
 server
+md5password
diff --git a/tinyldap.c b/tinyldap.c
index 11622ec..20bfe23 100644
--- a/tinyldap.c
+++ b/tinyldap.c
@@ -558,13 +558,15 @@ int handle(int in,int out) {
 	    if (name.l) {
 	      struct Filter f;
 	      struct string password;
-	      f.type=EQUAL; f.attrofs=dn_ofs;
+	      f.type=EQUAL;
 	      scan_ldapstring(buf+res+tmp,buf+res+len,&password);
 	      f.ava.desc.l=2; f.ava.desc.s="dn";
 	      f.ava.value=name;
 	      f.next=0;
+	      fixup(&f);
 
 	      if (!indexable(&f)) {
+		buffer_putsflush(buffer_2,"no index for dn, bind failed!\n");
 authfailure:
 		{
 		  char outbuf[1024];
@@ -582,8 +584,12 @@ authfailure:
 		useindex(&f,result);
 		done=0;
 		for (i=0; i<record_set_length; ++i)
-		  if (result[i]) 
+		  if (result[i])
 		    done=1;
+		if (!done) {
+		  buffer_putsflush(buffer_2,"no matching dn found, bind failed!\n");
+		  goto authfailure;
+		}
 		done=0;
 		for (i=0; i<record_count; ) {
 		  if (!result[i/(8*sizeof(long))]) {
@@ -595,8 +601,10 @@ authfailure:
 		      uint32 j;
 		      const char* c;
 		      uint32_unpack(map+indices_offset+4*i,&j);
-		      if (!(j=ldap_find_attr_value(j,userPassword_ofs)))
+		      if (!(j=ldap_find_attr_value(j,userPassword_ofs))) {
+			buffer_putsflush(buffer_2,"no userPassword attribute found, bind failed!\n");
 			goto authfailure;
+		      }
 		      c=map+j;
 #if 0
 		      buffer_puts(buffer_2,"compare ");
@@ -612,7 +620,10 @@ authfailure:
 		    }
 		  }
 		}
-		if (!done) goto authfailure;
+		if (!done) {
+		  buffer_putsflush(buffer_2,"wrong password, bind failed!\n");
+		  goto authfailure;
+		}
 found:
 	      }
 	    }