Fixed EmailManager naming standards and added usernames for emails