APM use Userprincipalname or SamAccountname

I have several working APM profiles, I want to add the ability to use UPN as well as SamAccountname. Looking at some options, I've changed to LDAP auth with a search filter (|(sAMAccountName=%{sessio...