fix up User.find_or_create_by_shibboleth to carry an email address too