Issue #1899336: Error in account_name_attr code where AccountName attribute was being used incorrectly