diff --git a/surfsense_web/components/Logo.tsx b/surfsense_web/components/Logo.tsx
index 79799942b..58f8d1c9f 100644
--- a/surfsense_web/components/Logo.tsx
+++ b/surfsense_web/components/Logo.tsx
@@ -7,7 +7,13 @@ import { cn } from "@/lib/utils";
 export const Logo = ({ className }: { className?: string }) => {
 	return (
 		<Link href="/">
-			<Image src="/icon-128.svg" className={cn("dark:invert", className)} alt="logo" width={128} height={128} />
+			<Image
+				src="/icon-128.svg"
+				className={cn("dark:invert", className)}
+				alt="logo"
+				width={128}
+				height={128}
+			/>
 		</Link>
 	);
 };
diff --git a/surfsense_web/components/TokenHandler.tsx b/surfsense_web/components/TokenHandler.tsx
index a190fe73f..24260f485 100644
--- a/surfsense_web/components/TokenHandler.tsx
+++ b/surfsense_web/components/TokenHandler.tsx
@@ -3,6 +3,7 @@
 import { useSearchParams } from "next/navigation";
 import { useEffect } from "react";
 import { getAndClearRedirectPath, setBearerToken } from "@/lib/auth-utils";
+import { trackLoginSuccess } from "@/lib/posthog/events";
 
 interface TokenHandlerProps {
 	redirectPath?: string; // Default path to redirect after storing token (if no saved path)
@@ -35,6 +36,16 @@ const TokenHandler = ({
 
 		if (token) {
 			try {
+				// Track login success for OAuth flows (e.g., Google)
+				// Local login already tracks success before redirecting here
+				const alreadyTracked = sessionStorage.getItem("login_success_tracked");
+				if (!alreadyTracked) {
+					// This is an OAuth flow (Google login) - track success
+					trackLoginSuccess("google");
+				}
+				// Clear the flag for future logins
+				sessionStorage.removeItem("login_success_tracked");
+				
 				// Store token in localStorage using both methods for compatibility
 				localStorage.setItem(storageKey, token);
 				setBearerToken(token);