Changed users to have names and email