--- gq-1.0.0/src/util.c.orig	2006-05-25 10:26:23.000000000 -0300
+++ gq-1.0.0/src/util.c	2006-05-25 10:27:41.000000000 -0300
@@ -89,8 +89,16 @@
 			     break;
 	
 		     case SASL_CB_PASS:
-			     interact->result = def->bindpw;
-			     interact->len = strlen(def->bindpw);
+			      if (def->ask_pw) {
+				      if (def->enteredpw[0]) {
+					      interact->result = def->enteredpw;
+					      interact->len = strlen(def->enteredpw);
+				      }
+			      }
+			      else if (def->bindpw[0]) {
+				      interact->result = def->bindpw;
+				      interact->len = strlen(def->bindpw);
+			      }
 			     break;
 	     }
      }