PDI-10342 Changes to support auth UI (Listbox updates)