added email to User, changed "UID" to "username"