diff --git a/selftest/knownfail.d/rodc_rwdc b/selftest/knownfail.d/rodc_rwdc
deleted file mode 100644
index c148d035f5e..00000000000
--- a/selftest/knownfail.d/rodc_rwdc
+++ /dev/null
@@ -1 +0,0 @@
-^samba4.ldap.rodc_rwdc.*test_ldap_change_password_simple_bind
diff --git a/source4/auth/ntlm/auth_simple.c b/source4/auth/ntlm/auth_simple.c
index 4f8267e9285..006e4d8279a 100644
--- a/source4/auth/ntlm/auth_simple.c
+++ b/source4/auth/ntlm/auth_simple.c
@@ -121,8 +121,9 @@ _PUBLIC_ struct tevent_req *authenticate_ldap_simple_bind_send(TALLOC_CTX *mem_c
 		return tevent_req_post(req, ev);
 	}
 
-	user_info->mapped.account_name = nt4_username;
-	user_info->mapped.domain_name = nt4_domain;
+	user_info->orig_client = user_info->client;
+	user_info->client.account_name = nt4_username;
+	user_info->client.domain_name = nt4_domain;
 	user_info->cracknames_called = true;
 
 	subreq = auth_check_password_send(state, ev,