Fix admin user search
#1794

toolness wants to merge fix-user-search into develop

We do not currently have an analysis of these two commits