Sorry for all the commits on this - my local LDAP isn’t working and I can’t figure out why, so no easy way to test locally