diff --git a/src/oidc.rs b/src/oidc.rs
index 1fbc5ba..88f9015 100644
--- a/src/oidc.rs
+++ b/src/oidc.rs
@@ -14,14 +14,7 @@ use openidconnect::{
         CoreJwsSigningAlgorithm, CoreProviderMetadata, CoreRegisterErrorResponseType,
         CoreResponseType, CoreRsaPrivateSigningKey, CoreSubjectIdentifierType, CoreTokenResponse,
         CoreTokenType, CoreUserInfoClaims, CoreUserInfoJsonWebToken,
-    },
-    registration::{EmptyAdditionalClientMetadata, EmptyAdditionalClientRegistrationResponse},
-    url::Url,
-    AccessToken, Audience, AuthUrl, ClientConfigUrl, ClientId, ClientSecret, EmptyAdditionalClaims,
-    EmptyAdditionalProviderMetadata, EmptyExtraTokenFields, EndUserPictureUrl, EndUserUsername,
-    IssuerUrl, JsonWebKeyId, JsonWebKeySetUrl, LocalizedClaim, Nonce, OpPolicyUrl, OpTosUrl,
-    PrivateSigningKey, RedirectUrl, RegistrationAccessToken, RegistrationUrl, RequestUrl,
-    ResponseTypes, Scope, StandardClaims, SubjectIdentifier, TokenUrl, UserInfoUrl,
+    }, registration::{EmptyAdditionalClientMetadata, EmptyAdditionalClientRegistrationResponse}, url::Url, AccessToken, Audience, AuthUrl, ClientConfigUrl, ClientId, ClientSecret, EmptyAdditionalClaims, EmptyAdditionalProviderMetadata, EmptyExtraTokenFields, EndUserEmail, EndUserPictureUrl, EndUserUsername, IssuerUrl, JsonWebKeyId, JsonWebKeySetUrl, LocalizedClaim, Nonce, OpPolicyUrl, OpTosUrl, PrivateSigningKey, RedirectUrl, RegistrationAccessToken, RegistrationUrl, RequestUrl, ResponseTypes, Scope, StandardClaims, SubjectIdentifier, TokenUrl, UserInfoUrl
 };
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 use rsa::{
@@ -239,7 +232,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());
+    let email = format!("{}@eth.woodburn.au", address);
     StandardClaims::new(subject_id)
         .set_preferred_username(Some(EndUserUsername::new(username)))
         .set_picture(avatar.map(|a| {
@@ -247,6 +240,7 @@ async fn resolve_claims(
             avatar_localized.insert(None, EndUserPictureUrl::new(a.to_string()));
             avatar_localized
         }))
+        .set_email(Some(EndUserEmail::new(email)))
 }
 
 #[derive(Serialize, Deserialize)]