diff --git a/src/main/kotlin/com/toyProject7/karrot/socialLogin/handler/CustomAuthenticationSuccessHandler.kt b/src/main/kotlin/com/toyProject7/karrot/socialLogin/handler/CustomAuthenticationSuccessHandler.kt
index 9a6d7c1..b59095b 100644
--- a/src/main/kotlin/com/toyProject7/karrot/socialLogin/handler/CustomAuthenticationSuccessHandler.kt
+++ b/src/main/kotlin/com/toyProject7/karrot/socialLogin/handler/CustomAuthenticationSuccessHandler.kt
@@ -5,7 +5,9 @@ import com.toyProject7.karrot.user.UserAccessTokenUtil
 import com.toyProject7.karrot.user.service.UserService
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
 import org.springframework.security.core.Authentication
+import org.springframework.security.core.context.SecurityContextHolder
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken
 import org.springframework.security.oauth2.core.user.OAuth2User
 import org.springframework.security.web.authentication.AuthenticationSuccessHandler
@@ -37,6 +39,16 @@ class CustomAuthenticationSuccessHandler(
         // Generate JWT
         val accessToken = UserAccessTokenUtil.generateAccessToken(user.id)
 
+        // Replace the OAuth2AuthenticationToken with a UsernamePasswordAuthenticationToken
+        val userDetails = userService.loadUserPrincipalById(user.id)
+        val usernamePasswordAuthenticationToken =
+            UsernamePasswordAuthenticationToken(
+                userDetails,
+                null,
+                userDetails.authorities,
+            )
+        SecurityContextHolder.getContext().authentication = usernamePasswordAuthenticationToken
+
         // Redirect to frontend with JWT included in URL fragment
         val redirectUri =
             UriComponentsBuilder.fromUriString("https://toykarrot.shop/oauth2/redirect")