Changed Usernames so that they are not email
Merged