Make automatic user search universal