Add username attribute to users
Improve modal for new account