diff --git a/client/bin/cli.js b/client/bin/cli.js
index ae4967f..7dc93ea 100755
--- a/client/bin/cli.js
+++ b/client/bin/cli.js
@@ -9,7 +9,10 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const distPath = join(__dirname, "../dist");
 
 const server = http.createServer((request, response) => {
-  return handler(request, response, { public: distPath });
+  return handler(request, response, {
+    public: distPath,
+    rewrites: [{ source: "/**", destination: "/index.html" }],
+  });
 });
 
 const port = process.env.PORT || 5173;
diff --git a/client/src/lib/auth.ts b/client/src/lib/auth.ts
index 592dc17..b67f21d 100644
--- a/client/src/lib/auth.ts
+++ b/client/src/lib/auth.ts
@@ -86,9 +86,9 @@ export async function handleOAuthCallback(
   const response = await fetch(metadata.token_endpoint, {
     method: "POST",
     headers: {
-      "Content-Type": "application/json",
+      "Content-Type": "application/x-www-form-urlencoded",
     },
-    body: JSON.stringify({
+    body: new URLSearchParams({
       grant_type: "authorization_code",
       code,
       code_verifier: codeVerifier,
@@ -117,9 +117,9 @@ export async function refreshAccessToken(
   const response = await fetch(metadata.token_endpoint, {
     method: "POST",
     headers: {
-      "Content-Type": "application/json",
+      "Content-Type": "application/x-www-form-urlencoded",
     },
-    body: JSON.stringify({
+    body: new URLSearchParams({
       grant_type: "refresh_token",
       refresh_token: refreshToken,
     }),