Add more users from discovery and fixed truncated names.