Added username and email