Rename "username" to "email" for accuracy
Change other instances of username to email