diff --git a/crates/app/obs_gateway/src/endpoints/oauth_end.rs b/crates/app/obs_gateway/src/endpoints/oauth_end.rs
index d0592e8217..4c8216ef85 100644
--- a/crates/app/obs_gateway/src/endpoints/oauth_end.rs
+++ b/crates/app/obs_gateway/src/endpoints/oauth_end.rs
@@ -9,6 +9,7 @@ use log::warn;
 use std::fmt;
 use std::sync::Arc;
 use twitch_oauth2::tokens::BearerTokenType::UserToken;
+use twitch_oauth2::CsrfToken;
 
 #[derive(Deserialize)]
 pub struct QueryParams {
@@ -78,6 +79,10 @@ pub async fn oauth_end_enroll_from_redirect(
     }
   };
 
+  // TODO/FIXME: This is a major security issue (part 1).
+  //  These need to be persisted in the database and associated with the user.
+  let csrf_token = CsrfToken::new(&state);
+
   let redirect_url =
       twitch_oauth2::url::Url::parse(&server_state.twitch_oauth_secrets.redirect_url)
           .map_err(|e| {
@@ -91,6 +96,9 @@ pub async fn oauth_end_enroll_from_redirect(
     &redirect_url,
     true);
 
+  // TODO/FIXME: This is a major security issue (part 2).
+  builder.set_csrf(csrf_token);
+
   let http_client = &reqwest::Client::builder()
       .redirect(reqwest::redirect::Policy::none())
       .build()
diff --git a/crates/app/obs_gateway/src/twitch/oauth_token_builder.rs b/crates/app/obs_gateway/src/twitch/oauth_token_builder.rs
index 3e11fd6099..7f44e471f8 100644
--- a/crates/app/obs_gateway/src/twitch/oauth_token_builder.rs
+++ b/crates/app/obs_gateway/src/twitch/oauth_token_builder.rs
@@ -1,5 +1,5 @@
 use twitch_oauth2::tokens::UserTokenBuilder;
-use twitch_oauth2::{Scope, ClientSecret, ClientId};
+use twitch_oauth2::{Scope, ClientSecret, ClientId, CsrfToken};
 use twitch_oauth2::url::Url;
 
 /// Get the token builder with the scopes our app needs
@@ -22,4 +22,4 @@ pub fn get_oauth_token_builder(
         Scope::ChatRead,
       ])
       .force_verify(force_verify)
-}
\ No newline at end of file
+}