diff --git a/backend/internal/api/handlers.go b/backend/internal/api/handlers.go
index 901be5a..c3baf0e 100644
--- a/backend/internal/api/handlers.go
+++ b/backend/internal/api/handlers.go
@@ -390,7 +390,7 @@ func (h *ApiHandler) HandleGoogleCallback(w http.ResponseWriter, r *http.Request
 		SameSite: parseSameSite(h.cfg.JWT.CookieSameSite),
 	})
 
-	redirectURL := "/dashboard"
+	redirectURL := fmt.Sprintf("%s/oauth/callback#access_token=%s", h.cfg.Frontend.Url, url.QueryEscape(token))
 	h.logger.InfoContext(ctx, "Google OAuth login successful", "userId", user.ID, "email", user.Email, "redirectingTo", redirectURL)
 	http.Redirect(w, r, redirectURL, http.StatusTemporaryRedirect)
 }
diff --git a/backend/internal/auth/oauth.go b/backend/internal/auth/oauth.go
index abbacef..4c966b7 100644
--- a/backend/internal/auth/oauth.go
+++ b/backend/internal/auth/oauth.go
@@ -14,14 +14,11 @@ import (
 
 // GoogleUserInfo holds user details fetched from Google.
 type GoogleUserInfo struct {
-	ID            string `json:"id"`             // The unique Google ID
-	Email         string `json:"email"`          // The user's email address
-	VerifiedEmail bool   `json:"verified_email"` // Whether Google has verified the email
-	Name          string `json:"name"`           // User's full name
-	GivenName     string `json:"given_name"`     // First name
-	FamilyName    string `json:"family_name"`    // Last name
-	Picture       string `json:"picture"`        // URL to profile picture
-	Locale        string `json:"locale"`         // User's locale (e.g., "en")
+	ID            string `json:"sub"`
+	Email         string `json:"email"`
+	VerifiedEmail bool   `json:"email_verified"`
+	Name          string `json:"name"`
+	Picture       string `json:"picture"`
 }
 
 // OAuthProvider defines the interface for OAuth operations.
diff --git a/backend/internal/config/config.go b/backend/internal/config/config.go
index ead765e..72affa6 100644
--- a/backend/internal/config/config.go
+++ b/backend/internal/config/config.go
@@ -16,6 +16,7 @@ type Config struct {
 	OAuth    OAuthConfig
 	Cache    CacheConfig
 	Storage  StorageConfig
+	Frontend FrontendConfig
 }
 
 type ServerConfig struct {
@@ -37,9 +38,9 @@ type LocalStorageConfig struct {
 }
 
 type GCSStorageConfig struct {
-	BucketName       string `mapstructure:"bucketName"`
-	CredentialsFile  string `mapstructure:"credentialsFile"`
-	BaseDir          string `mapstructure:"baseDir"`
+	BucketName      string `mapstructure:"bucketName"`
+	CredentialsFile string `mapstructure:"credentialsFile"`
+	BaseDir         string `mapstructure:"baseDir"`
 }
 
 type DatabaseConfig struct {
@@ -79,6 +80,10 @@ type CacheConfig struct {
 	CleanupInterval   time.Duration `mapstructure:"cleanupInterval"`
 }
 
+type FrontendConfig struct {
+	Url string `mapstructure:"url"`
+}
+
 func LoadConfig(path string) (*Config, error) {
 	viper.SetConfigName("config") // name of config file (without extension)
 	viper.SetConfigType("yaml")   // or viper.SetConfigType("YAML")
@@ -103,6 +108,7 @@ func LoadConfig(path string) (*Config, error) {
 	viper.SetDefault("cache.cleanupInterval", 10*time.Minute)
 	viper.SetDefault("storage.type", "local") // Default to local storage
 	viper.SetDefault("storage.local.path", "./uploads")
+	viper.SetDefault("frontend.url", "http://localhost:3000")
 
 	err := viper.ReadInConfig()
 	if err != nil {
diff --git a/frontend/app/login/page.tsx b/frontend/app/login/page.tsx
index 635d670..5d6fdac 100644
--- a/frontend/app/login/page.tsx
+++ b/frontend/app/login/page.tsx
@@ -199,15 +199,17 @@ export default function LoginPage() {
                 Or continue with
               </span>
             </div>
-
             <div className="grid grid-cols-1 gap-4">
               <Button
                 type="button"
                 variant="outline"
                 className="w-full border-gray-300 text-gray-900 hover:bg-gray-100"
-                onClick={() =>
-                  toast.info("Google signup would be implemented here")
-                }
+                onClick={() => {
+                  const apiBaseUrl =
+                    process.env.NEXT_PUBLIC_API_BASE_URL ||
+                    "http://127.0.0.1:8080/api/v1";
+                  window.location.href = `${apiBaseUrl}/auth/google/login`;
+                }}
               >
                 <Icons.google className="mr-2 h-4 w-4" />
                 Google
diff --git a/frontend/app/oauth/callback/page.tsx b/frontend/app/oauth/callback/page.tsx
new file mode 100644
index 0000000..47365bb
--- /dev/null
+++ b/frontend/app/oauth/callback/page.tsx
@@ -0,0 +1,55 @@
+"use client";
+
+import { useEffect } from "react";
+import { useRouter } from "next/navigation";
+import { useAuth } from "@/hooks/use-auth";
+import { getCurrentUser } from "@/services/api-auth";
+import { toast } from "sonner";
+
+export default function OAuthCallbackPage() {
+  const router = useRouter();
+  const { login } = useAuth();
+
+  useEffect(() => {
+    let token: string | null = null;
+    if (typeof window !== "undefined") {
+      const urlParams = new URLSearchParams(window.location.search);
+      token = urlParams.get("access_token");
+
+      // If not in query, check hash fragment
+      if (!token && window.location.hash) {
+        const hashParams = new URLSearchParams(
+          window.location.hash.substring(1)
+        );
+        token = hashParams.get("access_token");
+      }
+    }
+
+    if (token) {
+      localStorage.setItem("access_token", token);
+
+      async function fetchUser() {
+        try {
+          const user = await getCurrentUser(token!);
+          login(token!, user);
+          toast.success("Logged in with Google!");
+          router.replace("/todos");
+        } catch (err) {
+          console.error(err);
+          toast.error("Google login failed");
+          router.replace("/login");
+        }
+      }
+      fetchUser();
+    } else {
+      toast.error("No access token found");
+      router.replace("/login");
+    }
+  }, [login, router]);
+
+  return (
+    <div className="flex items-center justify-center min-h-screen">
+      <span>Logging you in...</span>
+    </div>
+  );
+}
diff --git a/frontend/app/signup/page.tsx b/frontend/app/signup/page.tsx
index 9403148..b1aa94e 100644
--- a/frontend/app/signup/page.tsx
+++ b/frontend/app/signup/page.tsx
@@ -218,15 +218,17 @@ export default function SignupPage() {
                 Or register with
               </span>
             </div>
-
             <div className="grid grid-cols-1 gap-4">
               <Button
                 type="button"
                 variant="outline"
                 className="w-full border-gray-300 text-gray-900 hover:bg-gray-100"
-                onClick={() =>
-                  toast.info("Google signup would be implemented here")
-                }
+                onClick={() => {
+                  const apiBaseUrl =
+                    process.env.NEXT_PUBLIC_API_BASE_URL ||
+                    "http://127.0.0.1:8080/api/v1";
+                  window.location.href = `${apiBaseUrl}/auth/google/login`;
+                }}
               >
                 <Icons.google className="mr-2 h-4 w-4" />
                 Google
diff --git a/frontend/app/todos/layout.tsx b/frontend/app/todos/layout.tsx
index ea001fb..4a24985 100644
--- a/frontend/app/todos/layout.tsx
+++ b/frontend/app/todos/layout.tsx
@@ -28,7 +28,6 @@ export default function TodosLayout({
   }
 
   if (!isAuthenticated) {
-    router.push("/login");
     return null;
   }