Changed Username to Email address