Improve roles for generated users