Minor improvement

Better find user by name