diff --git a/docs/changes.md b/docs/changes.md
index 4d5989e..d64026a 100644
--- a/docs/changes.md
+++ b/docs/changes.md
@@ -2,6 +2,14 @@
 
 Keep up with the latest updates here :D
 
+## 2025-08-24
+
+### Fixed
+
+- Fixed profile saving loading indefinitely on Google callback page when username already exists ([#108](https://github.com/beatcode-official/client/pull/108)).
+
+---
+
 ## 2025-04-30
 
 ## Fixed
diff --git a/src/routes/(auth)/login/google/callback/+page.svelte b/src/routes/(auth)/login/google/callback/+page.svelte
index f7c615d..2751edb 100644
--- a/src/routes/(auth)/login/google/callback/+page.svelte
+++ b/src/routes/(auth)/login/google/callback/+page.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import type { PageProps } from "./$types";
 
-    import { type Infer, superForm } from "sveltekit-superforms";
+    import { type Infer, setError, superForm } from "sveltekit-superforms";
     import { type RegisterWithGoogleData, RegisterWithGoogleSchema } from "$models/auth";
 
     import * as Card from "$components/ui/card";
@@ -28,7 +28,18 @@
                 onResult: async ({ result }) => {
                     if (result.type === "redirect") {
                         announce(result, "Account created successfully");
+                    } else if (result.type === "error") {
+                        isSubmitting = false;
+                    } else if (result.type === "failure") {
+                        const error = result.data.error;
+                        if (error && error.toLowerCase().includes("username")) {
+                            setError(registerForm, "username", error);
+                        }
+                        isSubmitting = false;
                     }
+                },
+                onError: () => {
+                    isSubmitting = false;
                 }
             });
         }