Modify selectUser logic