diff --git a/src/oidc.rs b/src/oidc.rs
index 7ec509e..1fbc5ba 100644
--- a/src/oidc.rs
+++ b/src/oidc.rs
@@ -146,6 +146,7 @@ pub fn metadata(base_url: Url) -> Result<CoreProviderMetadata, CustomError> {
         CoreClaimName::new("iss".to_string()),
         CoreClaimName::new("preferred_username".to_string()),
         CoreClaimName::new("picture".to_string()),
+        CoreClaimName::new("email".to_string()),
     ]))
     .set_registration_endpoint(Some(RegistrationUrl::from_url(
         base_url
@@ -238,6 +239,7 @@ async fn resolve_claims(
         Ok(n) => resolve_avatar(eth_provider.clone(), &n).await,
         Err(_) => None,
     };
+    let email = format!("{}@{}", address, base_url.host_str().unwrap());
     StandardClaims::new(subject_id)
         .set_preferred_username(Some(EndUserUsername::new(username)))
         .set_picture(avatar.map(|a| {