diff --git a/lib/hdb/hdb-ldap.c b/lib/hdb/hdb-ldap.c
index 159637624..bced4a7ca 100644
--- a/lib/hdb/hdb-ldap.c
+++ b/lib/hdb/hdb-ldap.c
@@ -1199,11 +1199,11 @@ LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
 	if (flags_len < 2)
 	    goto out2;
 
-	if (flags_len > 2 && samba_acct_flags[0] == '[' 
+	if (samba_acct_flags[0] == '[' 
 	    && samba_acct_flags[flags_len - 1] == ']') 
 	    goto out2;
 
-	for (i=0; i< flags_len; i++) {
+	for (i=0; i < flags_len; i++) {
 	    switch (samba_acct_flags[i]) {
 	    case ' ':
 	    case '[':