Add email address to datastore. Clean up user handler. Show email address in admin template.