Set username as email
More changes