diff --git a/servers/slapd/back-ldbm/passwd.c b/servers/slapd/back-ldbm/passwd.c
index c4f81e7c80..41b3046459 100644
--- a/servers/slapd/back-ldbm/passwd.c
+++ b/servers/slapd/back-ldbm/passwd.c
@@ -144,6 +144,12 @@ ldbm_back_exop_passwd(
 		rc = ldbm_modify_internal( be,
 			conn, op, op->o_ndn, &ml, e, text, textbuf, textlen );
 
+		/* FIXME: ldbm_modify_internal may set *tex = textbuf,
+		 * which is BAD */
+		if ( *text == textbuf ) {
+			*text = NULL;
+		}
+
 		if( rc ) {
 			/* cannot return textbuf */
 			*text = "entry modify failed";