Changed from email address; added uncomfirmed email column to users