diff --git a/src/lib-dict-extra/dict-ldap.c b/src/lib-dict-extra/dict-ldap.c
index 170ec0343f..bed99ea64d 100644
--- a/src/lib-dict-extra/dict-ldap.c
+++ b/src/lib-dict-extra/dict-ldap.c
@@ -238,7 +238,8 @@ int ldap_dict_init(struct dict *dict_driver, const char *uri,
 	for(struct ldap_dict *ptr = ldap_dict_list;
 	    ptr != NULL;
 	    ptr = ptr->next) {
-		if (strcmp(ptr->uri, uri) == 0) {
+		if (strcmp(ptr->uri, uri) == 0 &&
+		    null_strcmp(ptr->username, set->username) == 0) {
 			*dict_r = (struct dict*)ptr;
 			return 0;
 		}