diff --git a/crates/config/src/sections/mod.rs b/crates/config/src/sections/mod.rs
index 0c3bf216e..f992d8698 100644
--- a/crates/config/src/sections/mod.rs
+++ b/crates/config/src/sections/mod.rs
@@ -52,10 +52,10 @@ pub use self::{
     upstream_oauth2::{
         ClaimsImports as UpstreamOAuth2ClaimsImports, DiscoveryMode as UpstreamOAuth2DiscoveryMode,
         EmailImportPreference as UpstreamOAuth2EmailImportPreference,
-        ImportAction as UpstreamOAuth2ImportAction, OnConflict as UpstreamOAuth2OnConflict,
+        ImportAction as UpstreamOAuth2ImportAction,
         OnBackchannelLogout as UpstreamOAuth2OnBackchannelLogout,
-        PkceMethod as UpstreamOAuth2PkceMethod, Provider as UpstreamOAuth2Provider,
-        ResponseMode as UpstreamOAuth2ResponseMode,
+        OnConflict as UpstreamOAuth2OnConflict, PkceMethod as UpstreamOAuth2PkceMethod,
+        Provider as UpstreamOAuth2Provider, ResponseMode as UpstreamOAuth2ResponseMode,
         TokenAuthMethod as UpstreamOAuth2TokenAuthMethod, UpstreamOAuth2Config,
     },
 };
diff --git a/crates/config/src/sections/upstream_oauth2.rs b/crates/config/src/sections/upstream_oauth2.rs
index 612190fff..bc654c8fd 100644
--- a/crates/config/src/sections/upstream_oauth2.rs
+++ b/crates/config/src/sections/upstream_oauth2.rs
@@ -122,10 +122,9 @@ impl ConfigurationSection for UpstreamOAuth2Config {
                 provider.claims_imports.localpart.on_conflict,
                 OnConflict::Add
             ) && !matches!(
-                    provider.claims_imports.localpart.action,
-                    ImportAction::Force | ImportAction::Require
-                )
-            {
+                provider.claims_imports.localpart.action,
+                ImportAction::Force | ImportAction::Require
+            ) {
                 return annotate(figment::Error::custom(
                     "The field `action` must be either `force` or `require` when `on_conflict` is set to `add`",
                 ));
diff --git a/crates/data-model/src/lib.rs b/crates/data-model/src/lib.rs
index 059614d15..f1b551891 100644
--- a/crates/data-model/src/lib.rs
+++ b/crates/data-model/src/lib.rs
@@ -42,10 +42,10 @@ pub use self::{
         UpstreamOAuthAuthorizationSession, UpstreamOAuthAuthorizationSessionState,
         UpstreamOAuthLink, UpstreamOAuthProvider, UpstreamOAuthProviderClaimsImports,
         UpstreamOAuthProviderDiscoveryMode, UpstreamOAuthProviderImportAction,
-        UpstreamOAuthProviderImportPreference, UpstreamOAuthProviderLocalpartPreference, UpstreamOAuthProviderOnBackchannelLogout,
-        UpstreamOAuthProviderOnConflict, UpstreamOAuthProviderPkceMode,
-        UpstreamOAuthProviderResponseMode, UpstreamOAuthProviderSubjectPreference,
-        UpstreamOAuthProviderTokenAuthMethod,
+        UpstreamOAuthProviderImportPreference, UpstreamOAuthProviderLocalpartPreference,
+        UpstreamOAuthProviderOnBackchannelLogout, UpstreamOAuthProviderOnConflict,
+        UpstreamOAuthProviderPkceMode, UpstreamOAuthProviderResponseMode,
+        UpstreamOAuthProviderSubjectPreference, UpstreamOAuthProviderTokenAuthMethod,
     },
     user_agent::{DeviceType, UserAgent},
     users::{
diff --git a/crates/data-model/src/upstream_oauth2/mod.rs b/crates/data-model/src/upstream_oauth2/mod.rs
index 26c449594..563716568 100644
--- a/crates/data-model/src/upstream_oauth2/mod.rs
+++ b/crates/data-model/src/upstream_oauth2/mod.rs
@@ -15,8 +15,8 @@ pub use self::{
         DiscoveryMode as UpstreamOAuthProviderDiscoveryMode,
         ImportAction as UpstreamOAuthProviderImportAction,
         ImportPreference as UpstreamOAuthProviderImportPreference,
-        OnBackchannelLogout as UpstreamOAuthProviderOnBackchannelLogout,
         LocalpartPreference as UpstreamOAuthProviderLocalpartPreference,
+        OnBackchannelLogout as UpstreamOAuthProviderOnBackchannelLogout,
         OnConflict as UpstreamOAuthProviderOnConflict, PkceMode as UpstreamOAuthProviderPkceMode,
         ResponseMode as UpstreamOAuthProviderResponseMode,
         SubjectPreference as UpstreamOAuthProviderSubjectPreference,
diff --git a/crates/handlers/src/upstream_oauth2/link.rs b/crates/handlers/src/upstream_oauth2/link.rs
index d58c4ef55..037129339 100644
--- a/crates/handlers/src/upstream_oauth2/link.rs
+++ b/crates/handlers/src/upstream_oauth2/link.rs
@@ -1066,7 +1066,8 @@ mod tests {
             .signing_key_for_alg(&JsonWebSignatureAlg::Rs256)
             .unwrap();
         let header = JsonWebSignatureHeader::new(JsonWebSignatureAlg::Rs256);
-        let id_token = Jwt::sign_with_rng(&mut rng, header,  id_token_claims.clone(), &signer).unwrap();
+        let id_token =
+            Jwt::sign_with_rng(&mut rng, header, id_token_claims.clone(), &signer).unwrap();
 
         // Provision a provider and a link
         let mut repo = state.repository().await.unwrap();
@@ -1301,7 +1302,7 @@ mod tests {
             &provider,
             &subject,
             &id_token.into_string(),
-            id_token_claims
+            id_token_claims,
         )
         .await
         .unwrap();
@@ -1454,7 +1455,7 @@ mod tests {
             &provider,
             &subject,
             &id_token.into_string(),
-            id_token_claims
+            id_token_claims,
         )
         .await
         .unwrap();
@@ -1551,7 +1552,15 @@ mod tests {
 
         let session = repo
             .upstream_oauth_session()
-            .complete_with_link(clock, session, &link, Some(id_token.to_owned()), Some(id_token_claims), None, None)
+            .complete_with_link(
+                clock,
+                session,
+                &link,
+                Some(id_token.to_owned()),
+                Some(id_token_claims),
+                None,
+                None,
+            )
             .await?;
 
         Ok((link, session))