diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a32bf7..ad31288 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,4 +28,5 @@ jobs:
           VITE_TEST_PASSWORD: ${{ secrets.VITE_TEST_PASSWORD }}
           VITE_TEST_NAME: ${{ secrets.VITE_TEST_NAME }}
           VITE_TEST_INVITE_CODE: ${{ secrets.VITE_TEST_INVITE_CODE }}
+          VITE_TEST_CLIENT_ID: ${{ secrets.VITE_TEST_CLIENT_ID }}
         run: bun test 
\ No newline at end of file
diff --git a/README.md b/README.md
index c5c8629..c1d5f84 100644
--- a/README.md
+++ b/README.md
@@ -12,14 +12,19 @@ npm install @opensecret/react
 
 ## Usage
 
-Wrap your application in the `OpenSecretProvider` component and provide the URL of your OpenSecret backend:
+Wrap your application in the `OpenSecretProvider` component and provide:
+1. The URL of your OpenSecret backend
+2. Your project's client ID (a UUID that identifies your project)
 
 ```tsx
 import { OpenSecretProvider } from "@opensecret/react";
 
 function App() {
   return (
-    <OpenSecretProvider apiUrl="{URL}">
+    <OpenSecretProvider 
+      apiUrl="{URL}"
+      clientId="{PROJECT_UUID}"
+    >
       <App />
     </OpenSecretProvider>
   );
@@ -52,10 +57,15 @@ function App() {
 
 ### `OpenSecretProvider`
 
-The `OpenSecretProvider` component is the main entry point for the SDK. It requires a single prop, `apiUrl`, which should be set to the URL of your OpenSecret backend.
+The `OpenSecretProvider` component is the main entry point for the SDK. It requires two props:
+- `apiUrl`: The URL of your OpenSecret backend
+- `clientId`: A UUID that identifies your project/tenant. This is used to scope user accounts and data to your specific project.
 
 ```tsx
-<OpenSecretProvider apiUrl="{URL}">
+<OpenSecretProvider 
+  apiUrl="{URL}"
+  clientId="{PROJECT_UUID}"
+>
   <App />
 </OpenSecretProvider>
 ```
@@ -67,9 +77,9 @@ The `useOpenSecret` hook provides access to the OpenSecret API. It returns an ob
 #### Authentication Methods
 - `signIn(email: string, password: string): Promise<void>`: Signs in a user with the provided email and password.
 - `signUp(email: string, password: string, inviteCode: string, name?: string): Promise<void>`: Signs up a new user with the provided email, password, invite code, and optional name.
-- `signInGuest(id: string, password: string): Promise<void>`: Signs in a guest user with their ID and password.
-- `signUpGuest(password: string, inviteCode: string): Promise<LoginResponse>`: Creates a new guest account with just a password and invite code. Returns a response containing the guest's ID, access token, and refresh token.
-- `convertGuestToUserAccount(email: string, password: string, name?: string): Promise<void>`: Converts current guest account to a regular account with email authentication. Optionally sets the user's name.
+- `signInGuest(id: string, password: string): Promise<void>`: Signs in a guest user with their ID and password. Guest accounts are scoped to the project specified by `clientId`.
+- `signUpGuest(password: string, inviteCode: string): Promise<LoginResponse>`: Creates a new guest account with just a password and invite code. Returns a response containing the guest's ID, access token, and refresh token. The guest account will be associated with the project specified by `clientId`.
+- `convertGuestToUserAccount(email: string, password: string, name?: string): Promise<void>`: Converts current guest account to a regular account with email authentication. Optionally sets the user's name. The account remains associated with the same project it was created under.
 - `signOut(): Promise<void>`: Signs out the current user.
 
 #### Key-Value Storage Methods
diff --git a/package.json b/package.json
index 676ec40..365af46 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,9 @@
   "scripts": {
     "dev": "vite",
     "build": "tsc -p tsconfig.build.json && npx vite build",
-    "pack": "bun run build && bun pm pack"
+    "pack": "bun run build && bun pm pack",
+    "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,css,md}\"",
+    "format:check": "prettier --check \"src/**/*.{ts,tsx,js,jsx,json,css,md}\""
   },
   "peerDependencies": {
     "react": "^18.3.1",
diff --git a/src/AI.tsx b/src/AI.tsx
index 23e92a1..4af886e 100644
--- a/src/AI.tsx
+++ b/src/AI.tsx
@@ -20,8 +20,8 @@ export function AI() {
     setResponse("");
 
     if (!os.auth.user) {
-        alert("Please log in to use the AI chat.");
-        return;
+      alert("Please log in to use the AI chat.");
+      return;
     }
 
     const customFetch = os.aiCustomFetch;
@@ -30,16 +30,16 @@ export function AI() {
 
     try {
       console.log("Starting chat request to URL:", `${os.apiUrl}/v1/`);
-      
+
       const openai = new OpenAI({
         baseURL: `${os.apiUrl}/v1/`,
         dangerouslyAllowBrowser: true,
         apiKey: "api-key-doesnt-matter",
         defaultHeaders: {
           "Accept-Encoding": "identity",
-          "Content-Type": "application/json",
+          "Content-Type": "application/json"
         },
-        fetch: customFetch,
+        fetch: customFetch
       });
 
       console.log("Created OpenAI client");
@@ -51,7 +51,7 @@ export function AI() {
       const stream = await openai.beta.chat.completions.stream({
         model,
         messages,
-        stream: true,
+        stream: true
       });
 
       console.log("Stream created successfully");
@@ -95,8 +95,8 @@ export function AI() {
           className="w-full p-2 border rounded"
           disabled={loading}
         />
-        <button 
-          type="submit" 
+        <button
+          type="submit"
           disabled={loading}
           className="mt-2 px-4 py-2 bg-blue-500 text-white rounded disabled:bg-gray-400"
         >
@@ -105,9 +105,7 @@ export function AI() {
       </form>
 
       {response && (
-        <div className="mt-4 p-4 border rounded bg-gray-50 whitespace-pre-wrap">
-          {response}
-        </div>
+        <div className="mt-4 p-4 border rounded bg-gray-50 whitespace-pre-wrap">{response}</div>
       )}
     </div>
   );
diff --git a/src/App.css b/src/App.css
index a110dd2..4930879 100644
--- a/src/App.css
+++ b/src/App.css
@@ -73,7 +73,10 @@ button {
 
 .grid-container {
   display: grid;
-  grid-template-columns: minmax(min-content, 150px) 1fr minmax(min-content, 120px) minmax(min-content, 120px);
+  grid-template-columns: minmax(min-content, 150px) 1fr minmax(min-content, 120px) minmax(
+      min-content,
+      120px
+    );
   gap: 1rem;
 }
 
diff --git a/src/App.tsx b/src/App.tsx
index 318d7e9..b380c88 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3,7 +3,7 @@ import { useState } from "react";
 import React from "react";
 import { useOpenSecret } from "./lib";
 import type { KVListItem } from "./lib";
-import { schnorr, secp256k1 } from '@noble/curves/secp256k1';
+import { schnorr, secp256k1 } from "@noble/curves/secp256k1";
 import { AI } from "./AI";
 
 function TokenGenerator() {
@@ -41,14 +41,14 @@ function TokenGenerator() {
       {token && (
         <div className="data-display" style={{ marginTop: "1rem" }}>
           <h4>Generated Token:</h4>
-          <textarea 
-            readOnly 
-            value={token} 
+          <textarea
+            readOnly
+            value={token}
             rows={4}
             className="json-input"
             style={{ width: "100%" }}
           />
-          <button 
+          <button
             onClick={() => navigator.clipboard.writeText(token)}
             style={{ marginTop: "0.5rem" }}
           >
@@ -248,11 +248,11 @@ function App() {
     e.preventDefault();
     const formData = new FormData(e.currentTarget);
     const message = formData.get("message") as string;
-    
+
     try {
       const messageBytes = new TextEncoder().encode(message);
       const response = await os.signMessage(messageBytes, algorithm, derivationPath || undefined);
-      
+
       setLastSignature({
         signature: response.signature,
         messageHash: response.message_hash,
@@ -274,17 +274,9 @@ function App() {
     try {
       let isValid: boolean;
       if (algorithm === "schnorr") {
-        isValid = schnorr.verify(
-          lastSignature.signature,
-          lastSignature.messageHash,
-          publicKey
-        );
+        isValid = schnorr.verify(lastSignature.signature, lastSignature.messageHash, publicKey);
       } else {
-        isValid = secp256k1.verify(
-          lastSignature.signature,
-          lastSignature.messageHash,
-          publicKey
-        );
+        isValid = secp256k1.verify(lastSignature.signature, lastSignature.messageHash, publicKey);
       }
       setVerificationResult(isValid);
     } catch (error) {
@@ -385,25 +377,26 @@ function App() {
         </form>
       </section>
 
-      {(os.auth.user?.user && (os.auth.user.user.email === undefined || os.auth.user.user.email === null)) && (
-        <section>
-          <h2>Convert Guest Account</h2>
-          <p>Convert your guest account to a regular account with email.</p>
-          <form onSubmit={handleGuestConversion} className="auth-form">
-            <input type="email" name="email" placeholder="Email" autoComplete="email" required />
-            <input type="text" name="name" placeholder="Name (optional)" autoComplete="name" />
-            <input
-              type="password"
-              name="password"
-              placeholder="New Password"
-              autoComplete="new-password"
-              minLength={8}
-              required
-            />
-            <button type="submit">Convert to Email Account</button>
-          </form>
-        </section>
-      )}
+      {os.auth.user?.user &&
+        (os.auth.user.user.email === undefined || os.auth.user.user.email === null) && (
+          <section>
+            <h2>Convert Guest Account</h2>
+            <p>Convert your guest account to a regular account with email.</p>
+            <form onSubmit={handleGuestConversion} className="auth-form">
+              <input type="email" name="email" placeholder="Email" autoComplete="email" required />
+              <input type="text" name="name" placeholder="Name (optional)" autoComplete="name" />
+              <input
+                type="password"
+                name="password"
+                placeholder="New Password"
+                autoComplete="new-password"
+                minLength={8}
+                required
+              />
+              <button type="submit">Convert to Email Account</button>
+            </form>
+          </section>
+        )}
 
       <section>
         <h2>Get Data</h2>
@@ -466,12 +459,14 @@ function App() {
       <section>
         <h2>Private Key</h2>
         <p>Retrieve your private key mnemonic phrase. Keep this secure and never share it.</p>
-        
-        <button 
+
+        <button
           onClick={async () => {
             try {
               const response = await os.getPrivateKey();
-              alert(`Your mnemonic phrase is:\n\n${response.mnemonic}\n\nPlease store this securely and never share it with anyone.`);
+              alert(
+                `Your mnemonic phrase is:\n\n${response.mnemonic}\n\nPlease store this securely and never share it with anyone.`
+              );
             } catch (error) {
               console.error("Failed to get private key:", error);
               alert("Failed to get private key: " + (error as Error).message);
@@ -493,36 +488,43 @@ function App() {
               <li>BIP84 (Native SegWit): m/84'/0'/0'/0/0</li>
               <li>BIP86 (Taproot): m/86'/0'/0'/0/0</li>
             </ul>
-            <p><small>
-              Note: Supports both absolute (starting with "m/") and relative paths.
-              Supports hardened derivation using either ' or h notation.
-            </small></p>
-            <p><small>
-              Examples:
-              <ul>
-                <li>Absolute path: "m/44'/0'/0'/0/0"</li>
-                <li>Relative path: "0'/0'/0'/0/0"</li>
-                <li>Hardened notation: "44'" or "44h"</li>
-              </ul>
-            </small></p>
+            <p>
+              <small>
+                Note: Supports both absolute (starting with "m/") and relative paths. Supports
+                hardened derivation using either ' or h notation.
+              </small>
+            </p>
+            <p>
+              <small>
+                Examples:
+                <ul>
+                  <li>Absolute path: "m/44'/0'/0'/0/0"</li>
+                  <li>Relative path: "0'/0'/0'/0/0"</li>
+                  <li>Hardened notation: "44'" or "44h"</li>
+                </ul>
+              </small>
+            </p>
           </details>
-          <form onSubmit={async (e) => {
-            e.preventDefault();
-            const formData = new FormData(e.currentTarget);
-            const derivationPath = formData.get("derivationPath") as string;
-            
-            try {
-              const response = await os.getPrivateKeyBytes(derivationPath || undefined);
-              alert(`Private key bytes (hex):\n\n${response.private_key}`);
-            } catch (error) {
-              console.error("Failed to get private key bytes:", error);
-              alert("Failed to get private key bytes: " + (error as Error).message);
-            }
-          }} className="auth-form">
-            <input 
-              type="text" 
-              name="derivationPath" 
-              placeholder="Derivation path (e.g. m/44'/0'/0'/0/0)" 
+          <form
+            onSubmit={async (e) => {
+              e.preventDefault();
+              const formData = new FormData(e.currentTarget);
+              const derivationPath = formData.get("derivationPath") as string;
+
+              try {
+                const response = await os.getPrivateKeyBytes(derivationPath || undefined);
+                alert(`Private key bytes (hex):\n\n${response.private_key}`);
+              } catch (error) {
+                console.error("Failed to get private key bytes:", error);
+                alert("Failed to get private key bytes: " + (error as Error).message);
+              }
+            }}
+            className="auth-form"
+          >
+            <input
+              type="text"
+              name="derivationPath"
+              placeholder="Derivation path (e.g. m/44'/0'/0'/0/0)"
             />
             <button type="submit">Get Private Key Bytes</button>
           </form>
@@ -532,12 +534,12 @@ function App() {
       <section>
         <h2>Cryptographic Signing</h2>
         <p>Demonstrate message signing and verification using your key pair.</p>
-        
+
         <div style={{ marginBottom: "1rem" }}>
           <label>
             Algorithm:
-            <select 
-              value={algorithm} 
+            <select
+              value={algorithm}
               onChange={(e) => setAlgorithm(e.target.value as "schnorr" | "ecdsa")}
               style={{ marginLeft: "0.5rem" }}
             >
@@ -550,45 +552,63 @@ function App() {
         <div style={{ marginBottom: "1rem" }}>
           <details style={{ marginBottom: "0.5rem" }}>
             <summary>About derivation paths</summary>
-            <p><small>
-              The derivation path determines which private key is used for signing.
-              Different paths generate different key pairs from the same master key,
-              useful for separating keys by purpose or application.
-            </small></p>
-            <p><small>Common paths and their uses:</small></p>
+            <p>
+              <small>
+                The derivation path determines which private key is used for signing. Different
+                paths generate different key pairs from the same master key, useful for separating
+                keys by purpose or application.
+              </small>
+            </p>
+            <p>
+              <small>Common paths and their uses:</small>
+            </p>
             <ul>
-              <li><small>BIP44 (Legacy): m/44'/0'/0'/0/0 - For legacy Bitcoin addresses</small></li>
-              <li><small>BIP49 (SegWit): m/49'/0'/0'/0/0 - For SegWit addresses</small></li>
-              <li><small>BIP84 (Native SegWit): m/84'/0'/0'/0/0 - For Native SegWit</small></li>
-              <li><small>BIP86 (Taproot): m/86'/0'/0'/0/0 - For Taproot addresses</small></li>
+              <li>
+                <small>BIP44 (Legacy): m/44'/0'/0'/0/0 - For legacy Bitcoin addresses</small>
+              </li>
+              <li>
+                <small>BIP49 (SegWit): m/49'/0'/0'/0/0 - For SegWit addresses</small>
+              </li>
+              <li>
+                <small>BIP84 (Native SegWit): m/84'/0'/0'/0/0 - For Native SegWit</small>
+              </li>
+              <li>
+                <small>BIP86 (Taproot): m/86'/0'/0'/0/0 - For Taproot addresses</small>
+              </li>
             </ul>
-            <p><small>
-              Path format examples:
-              <ul>
-                <li>Absolute: "m/44'/0'/0'/0/0"</li>
-                <li>Relative: "0'/0'/0'/0/0"</li>
-                <li>Hardened: "44'" or "44h"</li>
-              </ul>
-              Leave empty to use the master key.
-            </small></p>
+            <p>
+              <small>
+                Path format examples:
+                <ul>
+                  <li>Absolute: "m/44'/0'/0'/0/0"</li>
+                  <li>Relative: "0'/0'/0'/0/0"</li>
+                  <li>Hardened: "44'" or "44h"</li>
+                </ul>
+                Leave empty to use the master key.
+              </small>
+            </p>
           </details>
-          <input 
-            type="text" 
+          <input
+            type="text"
             value={derivationPath}
             onChange={(e) => setDerivationPath(e.target.value)}
             placeholder="Derivation path (optional)"
             style={{ marginRight: "0.5rem", padding: "0.5rem" }}
           />
-          <button onClick={async () => {
-            try {
-              const response = await os.getPublicKey(algorithm, derivationPath || undefined);
-              setPublicKey(response.public_key);
-              setVerificationResult(null);
-            } catch (error) {
-              console.error("Failed to get public key:", error);
-              alert("Failed to get public key: " + (error as Error).message);
-            }
-          }}>Get Public Key</button>
+          <button
+            onClick={async () => {
+              try {
+                const response = await os.getPublicKey(algorithm, derivationPath || undefined);
+                setPublicKey(response.public_key);
+                setVerificationResult(null);
+              } catch (error) {
+                console.error("Failed to get public key:", error);
+                alert("Failed to get public key: " + (error as Error).message);
+              }
+            }}
+          >
+            Get Public Key
+          </button>
         </div>
 
         {publicKey && (
@@ -600,44 +620,49 @@ function App() {
         <form onSubmit={handleSignMessage} className="auth-form">
           <details style={{ marginBottom: "0.5rem" }}>
             <summary>About message signing</summary>
-            <p><small>
-              Messages are converted to bytes before signing. Examples:
-            </small></p>
+            <p>
+              <small>Messages are converted to bytes before signing. Examples:</small>
+            </p>
             <pre style={{ fontSize: "small" }}>
-{`// From string
+              {`// From string
 const messageBytes = new TextEncoder().encode("Hello, World!");
 
 // From hex
 const messageBytes = new Uint8Array(Buffer.from("deadbeef", "hex"));`}
             </pre>
           </details>
-          <textarea 
-            name="message" 
-            placeholder="Enter message to sign" 
-            rows={4} 
+          <textarea
+            name="message"
+            placeholder="Enter message to sign"
+            rows={4}
             className="json-input"
-            required 
+            required
           />
           <button type="submit">Sign Message</button>
         </form>
 
         {lastSignature && (
           <div className="data-display" style={{ marginTop: "1rem", wordBreak: "break-all" }}>
-            <div><strong>Message:</strong> {lastSignature.message}</div>
-            <div><strong>Message Hash:</strong> {lastSignature.messageHash}</div>
-            <div><strong>Signature:</strong> {lastSignature.signature}</div>
-            <button 
-              onClick={handleVerifySignature}
-              style={{ marginTop: "0.5rem" }}
-            >
+            <div>
+              <strong>Message:</strong> {lastSignature.message}
+            </div>
+            <div>
+              <strong>Message Hash:</strong> {lastSignature.messageHash}
+            </div>
+            <div>
+              <strong>Signature:</strong> {lastSignature.signature}
+            </div>
+            <button onClick={handleVerifySignature} style={{ marginTop: "0.5rem" }}>
               Verify Signature
             </button>
             {verificationResult !== null && (
-              <div style={{ 
-                marginTop: "0.5rem",
-                color: verificationResult ? "green" : "red",
-                fontWeight: "bold"
-              }}>
+              <div
+                style={{
+                  marginTop: "0.5rem",
+                  color: verificationResult ? "green" : "red",
+                  fontWeight: "bold"
+                }}
+              >
                 Signature is {verificationResult ? "valid" : "invalid"}!
               </div>
             )}
@@ -656,7 +681,6 @@ const messageBytes = new Uint8Array(Buffer.from("deadbeef", "hex"));`}
         <p>Generate JWT tokens for authorized third-party services (URL-based).</p>
         <TokenGenerator />
       </section>
-
     </main>
   );
 }
diff --git a/src/global.d.ts b/src/global.d.ts
index 9469350..8795902 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -1,5 +1,5 @@
 // Declare .der files as Uint8Array
-declare module '*.der' {
+declare module "*.der" {
   const content: Uint8Array;
   export default content;
-} 
\ No newline at end of file
+}
diff --git a/src/lib/ai.test.ts b/src/lib/ai.test.ts
index e188dee..0e99f70 100644
--- a/src/lib/ai.test.ts
+++ b/src/lib/ai.test.ts
@@ -5,22 +5,31 @@ import OpenAI from "openai";
 
 const TEST_EMAIL = process.env.VITE_TEST_EMAIL;
 const TEST_PASSWORD = process.env.VITE_TEST_PASSWORD;
+const TEST_CLIENT_ID = process.env.VITE_TEST_CLIENT_ID;
 const API_URL = process.env.VITE_OPEN_SECRET_API_URL;
 
+if (!TEST_EMAIL || !TEST_PASSWORD || !TEST_CLIENT_ID || !API_URL) {
+  throw new Error("Test credentials must be set in .env.local");
+}
+
 type ChatMessage = {
-    role: "user" | "assistant";
-    content: string;
+  role: "user" | "assistant";
+  content: string;
 };
 
 async function setupTestUser() {
-  const { access_token, refresh_token } = await fetchLogin(TEST_EMAIL!, TEST_PASSWORD!);
+  const { access_token, refresh_token } = await fetchLogin(
+    TEST_EMAIL!,
+    TEST_PASSWORD!,
+    TEST_CLIENT_ID!
+  );
   window.localStorage.setItem("access_token", access_token);
   window.localStorage.setItem("refresh_token", refresh_token);
 }
 
 test("OpenAI custom fetch successfully makes a simple request", async () => {
   await setupTestUser();
-  
+
   const openai = new OpenAI({
     baseURL: `${API_URL}/v1/`,
     dangerouslyAllowBrowser: true,
@@ -31,8 +40,10 @@ test("OpenAI custom fetch successfully makes a simple request", async () => {
     fetch: createCustomFetch()
   });
 
-  const model = "hugging-quants/Meta-Llama-3.1-70B-Instruct-AWQ-INT4";
-  const messages = [{ role: "user", content: "please reply with exactly and only the word \"echo\"" } as ChatMessage];
+  const model = "ibnzterrell/Meta-Llama-3.3-70B-Instruct-AWQ-INT4";
+  const messages = [
+    { role: "user", content: 'please reply with exactly and only the word "echo"' } as ChatMessage
+  ];
 
   const stream = openai.beta.chat.completions.stream({
     model,
@@ -54,40 +65,40 @@ test("OpenAI custom fetch successfully makes a simple request", async () => {
 
 async function streamCompletion(prompt: string) {
   const customFetch = createCustomFetch();
-  let fullResponse = '';
-  
+  let fullResponse = "";
+
   const response = await customFetch(`${API_URL}/v1/chat/completions`, {
-    method: 'POST',
+    method: "POST",
     headers: {
-      'Content-Type': 'application/json',
-      'Accept': 'text/event-stream',
+      "Content-Type": "application/json",
+      Accept: "text/event-stream"
     },
     body: JSON.stringify({
-      model: 'hugging-quants/Meta-Llama-3.1-70B-Instruct-AWQ-INT4',
-      messages: [{ role: 'user', content: prompt }],
+      model: "ibnzterrell/Meta-Llama-3.3-70B-Instruct-AWQ-INT4",
+      messages: [{ role: "user", content: prompt }],
       stream: true
     })
   });
 
   const text = await response.text();
-  console.log('Full response text:', text);
-  
-  const lines = text.split('\n');
+  console.log("Full response text:", text);
+
+  const lines = text.split("\n");
   for (const line of lines) {
-    if (line.startsWith('data: ')) {
+    if (line.startsWith("data: ")) {
       const data = line.slice(6);
-      if (data === '[DONE]') {
+      if (data === "[DONE]") {
         break;
       }
       try {
         const parsed = JSON.parse(data);
         const content = parsed.choices[0]?.delta?.content;
         if (content) {
-          console.log('Content:', content);
+          console.log("Content:", content);
           fullResponse += content;
         }
       } catch (error) {
-        console.error('Error parsing JSON:', error);
+        console.error("Error parsing JSON:", error);
       }
     }
   }
@@ -97,9 +108,9 @@ async function streamCompletion(prompt: string) {
 
 test("streams chat completion", async () => {
   await setupTestUser();
-  
-  const response = await streamCompletion("please reply with exactly and only the word \"echo\"");
+
+  const response = await streamCompletion('please reply with exactly and only the word "echo"');
   console.log("Final response:", response);
-  
+
   expect(response?.trim()).toBe("echo");
-}); 
\ No newline at end of file
+});
diff --git a/src/lib/ai.ts b/src/lib/ai.ts
index 500d36b..832687f 100644
--- a/src/lib/ai.ts
+++ b/src/lib/ai.ts
@@ -2,8 +2,7 @@ import { decryptMessage, encryptMessage } from "./encryption";
 import { getAttestation } from "./getAttestation";
 import * as api from "./api";
 
-export function createCustomFetch(
-): (url: RequestInfo, init?: RequestInit) => Promise<Response> {
+export function createCustomFetch(): (url: RequestInfo, init?: RequestInit) => Promise<Response> {
   return async (requestUrl: RequestInfo, init?: RequestInit): Promise<Response> => {
     const getAuthHeader = () => {
       const currentAccessToken = window.localStorage.getItem("access_token");
diff --git a/src/lib/api.test.ts b/src/lib/api.test.ts
index 6069042..1c1d261 100644
--- a/src/lib/api.test.ts
+++ b/src/lib/api.test.ts
@@ -14,20 +14,21 @@ import {
 const TEST_EMAIL = process.env.VITE_TEST_EMAIL;
 const TEST_PASSWORD = process.env.VITE_TEST_PASSWORD;
 const TEST_NAME = process.env.VITE_TEST_NAME;
+const TEST_CLIENT_ID = process.env.VITE_TEST_CLIENT_ID;
 
-if (!TEST_EMAIL || !TEST_PASSWORD || !TEST_NAME) {
+if (!TEST_EMAIL || !TEST_PASSWORD || !TEST_NAME || !TEST_CLIENT_ID) {
   throw new Error("Test credentials must be set in .env.local");
 }
 
 async function tryEmailLogin() {
   // Ensure the test user exists
   try {
-    return await fetchLogin(TEST_EMAIL!, TEST_PASSWORD!);
+    return await fetchLogin(TEST_EMAIL!, TEST_PASSWORD!, TEST_CLIENT_ID!);
   } catch (error) {
     console.warn(error);
     console.log("Login failed, attempting signup");
-    await fetchSignUp(TEST_EMAIL!, TEST_PASSWORD!, "", TEST_NAME!);
-    return await fetchLogin(TEST_EMAIL!, TEST_PASSWORD!);
+    await fetchSignUp(TEST_EMAIL!, TEST_PASSWORD!, "", TEST_CLIENT_ID!, TEST_NAME!);
+    return await fetchLogin(TEST_EMAIL!, TEST_PASSWORD!, TEST_CLIENT_ID!);
   }
 }
 
@@ -61,14 +62,14 @@ test("Logout doesn't error", async () => {
 
 test("Guest signup and login flow", async () => {
   // Sign up as guest
-  const guestSignup = await fetchGuestSignUp(TEST_PASSWORD!, "");
+  const guestSignup = await fetchGuestSignUp(TEST_PASSWORD!, "", TEST_CLIENT_ID!);
   expect(guestSignup.id).toBeDefined();
   expect(guestSignup.email).toBeNull();
   expect(guestSignup.access_token).toBeDefined();
   expect(guestSignup.refresh_token).toBeDefined();
 
   // Login as guest
-  const guestLogin = await fetchGuestLogin(guestSignup.id, TEST_PASSWORD!);
+  const guestLogin = await fetchGuestLogin(guestSignup.id, TEST_PASSWORD!, TEST_CLIENT_ID!);
   expect(guestLogin.id).toBe(guestSignup.id);
   expect(guestLogin.access_token).toBeDefined();
 
@@ -87,7 +88,7 @@ test("Guest signup and login flow", async () => {
   const newPassword = Math.random().toString(36).substring(2);
 
   // Convert guest to email account
-  await convertGuestToEmailAccount(newEmail, newPassword);
+  await convertGuestToEmailAccount(newEmail, newPassword, undefined, TEST_CLIENT_ID!);
 
   // Verify converted user data
   const convertedUserResponse = await fetchUser();
@@ -96,7 +97,7 @@ test("Guest signup and login flow", async () => {
 
   // Try converting to an email address already in use
   try {
-    await convertGuestToEmailAccount(TEST_EMAIL!, newPassword);
+    await convertGuestToEmailAccount(TEST_EMAIL!, newPassword, undefined, TEST_CLIENT_ID!);
     throw new Error("Should not be able to convert to existing email");
   } catch (error: any) {
     expect(error.message).toBe("Bad Request");
@@ -104,21 +105,21 @@ test("Guest signup and login flow", async () => {
 
   // Try converting an already converted account
   try {
-    await convertGuestToEmailAccount("another@example.com", "newpassword123");
+    await convertGuestToEmailAccount("another@example.com", "newpassword123", undefined, TEST_CLIENT_ID!);
     throw new Error("Should not be able to convert an already converted account");
   } catch (error: any) {
     expect(error.message).toBe("Bad Request");
   }
 
   // Try login with new email and password (should succeed)
-  const emailLogin = await fetchLogin(newEmail, newPassword);
+  const emailLogin = await fetchLogin(newEmail, newPassword, TEST_CLIENT_ID!);
   expect(emailLogin.id).toBe(guestSignup.id);
   expect(emailLogin.email).toBe(newEmail);
   expect(emailLogin.access_token).toBeDefined();
 
   // Try guest login with old credentials (should fail)
   try {
-    await fetchGuestLogin(guestSignup.id, TEST_PASSWORD!);
+    await fetchGuestLogin(guestSignup.id, TEST_PASSWORD!, TEST_CLIENT_ID!);
     throw new Error("Should not be able to login with old guest credentials");
   } catch (error: any) {
     expect(error.message).toBe("Invalid email, password, or login method");
@@ -128,8 +129,8 @@ test("Guest signup and login flow", async () => {
 
 test("Guest refresh token works", async () => {
   // Sign up as guest
-  const guestSignup = await fetchGuestSignUp(TEST_PASSWORD!, "");
-  const guestLogin = await fetchGuestLogin(guestSignup.id, TEST_PASSWORD!);
+  const guestSignup = await fetchGuestSignUp(TEST_PASSWORD!, "", TEST_CLIENT_ID!);
+  const guestLogin = await fetchGuestLogin(guestSignup.id, TEST_PASSWORD!, TEST_CLIENT_ID!);
 
   // Set tokens for authenticated requests
   window.localStorage.setItem("access_token", guestLogin.access_token);
@@ -147,8 +148,8 @@ test("Guest refresh token works", async () => {
 
 test("Guest logout doesn't error", async () => {
   // Sign up as guest
-  const guestSignup = await fetchGuestSignUp(TEST_PASSWORD!, "");
-  const { refresh_token } = await fetchGuestLogin(guestSignup.id, TEST_PASSWORD!);
+  const guestSignup = await fetchGuestSignUp(TEST_PASSWORD!, "", TEST_CLIENT_ID!);
+  const { refresh_token } = await fetchGuestLogin(guestSignup.id, TEST_PASSWORD!, TEST_CLIENT_ID!);
   await fetchLogout(refresh_token);
 });
 
diff --git a/src/lib/api.ts b/src/lib/api.ts
index abb97f4..0bea7c9 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -44,23 +44,25 @@ export type KVListItem = {
 
 export async function fetchLogin(
   email: string,
-  password: string
+  password: string,
+  client_id: string
 ): Promise<LoginResponse> {
-  return encryptedApiCall<{ email: string; password: string }, LoginResponse>(
+  return encryptedApiCall<{ email: string; password: string; client_id: string }, LoginResponse>(
     `${apiUrl}/login`,
     "POST",
-    { email, password }
+    { email, password, client_id }
   );
 }
 
 export async function fetchGuestLogin(
   id: string,
-  password: string
+  password: string,
+  client_id: string
 ): Promise<LoginResponse> {
-  return encryptedApiCall<{ id: string; password: string }, LoginResponse>(
+  return encryptedApiCall<{ id: string; password: string; client_id: string }, LoginResponse>(
     `${apiUrl}/login`,
     "POST",
-    { id, password }
+    { id, password, client_id }
   );
 }
 
@@ -68,29 +70,39 @@ export async function fetchSignUp(
   email: string,
   password: string,
   inviteCode: string,
+  client_id: string,
   name?: string | null
 ): Promise<LoginResponse> {
   return encryptedApiCall<
-    { email: string; password: string; inviteCode: string; name?: string | null },
+    {
+      email: string;
+      password: string;
+      inviteCode: string;
+      name?: string | null;
+      client_id: string;
+    },
     LoginResponse
   >(`${apiUrl}/register`, "POST", {
     email,
     password,
     inviteCode: inviteCode.toLowerCase(),
+    client_id,
     name
   });
 }
 
 export async function fetchGuestSignUp(
   password: string,
-  inviteCode: string
+  inviteCode: string,
+  client_id: string
 ): Promise<LoginResponse> {
   return encryptedApiCall<
-    { password: string; inviteCode: string },
+    { password: string; inviteCode: string; client_id: string },
     LoginResponse
   >(`${apiUrl}/register`, "POST", {
     password,
-    inviteCode: inviteCode.toLowerCase()
+    inviteCode: inviteCode.toLowerCase(),
+    client_id
   });
 }
 
@@ -221,8 +233,16 @@ export async function keyExchange(
   return response.json();
 }
 
-export async function requestPasswordReset(email: string, hashedSecret: string): Promise<void> {
-  const resetData = { email, hashed_secret: hashedSecret };
+export async function requestPasswordReset(
+  email: string,
+  hashedSecret: string,
+  client_id: string
+): Promise<void> {
+  const resetData = {
+    email,
+    hashed_secret: hashedSecret,
+    client_id
+  };
   return encryptedApiCall<typeof resetData, void>(
     `${apiUrl}/password-reset/request`,
     "POST",
@@ -236,13 +256,15 @@ export async function confirmPasswordReset(
   email: string,
   alphanumericCode: string,
   plaintextSecret: string,
-  newPassword: string
+  newPassword: string,
+  client_id: string
 ): Promise<void> {
   const confirmData = {
     email,
     alphanumeric_code: alphanumericCode,
     plaintext_secret: plaintextSecret,
-    new_password: newPassword
+    new_password: newPassword,
+    client_id
   };
   return encryptedApiCall<typeof confirmData, void>(
     `${apiUrl}/password-reset/confirm`,
@@ -266,12 +288,15 @@ export async function changePassword(currentPassword: string, newPassword: strin
   );
 }
 
-export async function initiateGitHubAuth(inviteCode?: string): Promise<GithubAuthResponse> {
+export async function initiateGitHubAuth(
+  client_id: string,
+  inviteCode?: string
+): Promise<GithubAuthResponse> {
   try {
-    return await encryptedApiCall<{ invite_code?: string }, GithubAuthResponse>(
+    return await encryptedApiCall<{ invite_code?: string; client_id: string }, GithubAuthResponse>(
       `${apiUrl}/auth/github`,
       "POST",
-      inviteCode ? { invite_code: inviteCode } : {},
+      inviteCode ? { invite_code: inviteCode, client_id } : { client_id },
       undefined,
       "Failed to initiate GitHub auth"
     );
@@ -333,12 +358,15 @@ export type GoogleAuthResponse = {
   csrf_token: string;
 };
 
-export async function initiateGoogleAuth(inviteCode?: string): Promise<GoogleAuthResponse> {
+export async function initiateGoogleAuth(
+  client_id: string,
+  inviteCode?: string
+): Promise<GoogleAuthResponse> {
   try {
-    return await encryptedApiCall<{ invite_code?: string }, GoogleAuthResponse>(
+    return await encryptedApiCall<{ invite_code?: string; client_id: string }, GoogleAuthResponse>(
       `${apiUrl}/auth/google`,
       "POST",
-      inviteCode ? { invite_code: inviteCode } : {},
+      inviteCode ? { invite_code: inviteCode, client_id } : { client_id },
       undefined,
       "Failed to initiate Google auth"
     );
@@ -412,23 +440,25 @@ export async function fetchPrivateKey(): Promise<PrivateKeyResponse> {
 /**
  * Fetches private key bytes for a given derivation path
  * @param derivationPath - Optional BIP32 derivation path
- * 
+ *
  * Supports both absolute and relative paths with hardened derivation:
  * - Absolute path: "m/44'/0'/0'/0/0"
  * - Relative path: "0'/0'/0'/0/0"
  * - Hardened notation: "44'" or "44h"
- * 
+ *
  * Common paths:
  * - BIP44 (Legacy): m/44'/0'/0'/0/0
  * - BIP49 (SegWit): m/49'/0'/0'/0/0
  * - BIP84 (Native SegWit): m/84'/0'/0'/0/0
  * - BIP86 (Taproot): m/86'/0'/0'/0/0
  */
-export async function fetchPrivateKeyBytes(derivationPath?: string): Promise<PrivateKeyBytesResponse> {
-  const url = derivationPath 
+export async function fetchPrivateKeyBytes(
+  derivationPath?: string
+): Promise<PrivateKeyBytesResponse> {
+  const url = derivationPath
     ? `${apiUrl}/protected/private_key_bytes?derivation_path=${encodeURIComponent(derivationPath)}`
     : `${apiUrl}/protected/private_key_bytes`;
-  
+
   return authenticatedApiCall<void, PrivateKeyBytesResponse>(
     url,
     "GET",
@@ -444,7 +474,7 @@ export type SignMessageResponse = {
   message_hash: string;
 };
 
-type SigningAlgorithm = "schnorr" | "ecdsa"
+type SigningAlgorithm = "schnorr" | "ecdsa";
 
 export type SignMessageRequest = {
   /** Base64-encoded message to sign */
@@ -460,18 +490,18 @@ export type SignMessageRequest = {
  * @param message_bytes - Message to sign as Uint8Array
  * @param algorithm - Signing algorithm (schnorr or ecdsa)
  * @param derivationPath - Optional BIP32 derivation path
- * 
+ *
  * Example message preparation:
  * ```typescript
  * // From string
  * const messageBytes = new TextEncoder().encode("Hello, World!");
- * 
+ *
  * // From hex
  * const messageBytes = new Uint8Array(Buffer.from("deadbeef", "hex"));
  * ```
  */
 export async function signMessage(
-  message_bytes: Uint8Array, 
+  message_bytes: Uint8Array,
   algorithm: SigningAlgorithm,
   derivationPath?: string
 ): Promise<SignMessageResponse> {
@@ -479,7 +509,7 @@ export async function signMessage(
   return authenticatedApiCall<SignMessageRequest, SignMessageResponse>(
     `${apiUrl}/protected/sign_message`,
     "POST",
-    { 
+    {
       message_base64,
       algorithm,
       derivation_path: derivationPath
@@ -499,7 +529,7 @@ export type PublicKeyResponse = {
  * Retrieves the public key for a given algorithm and derivation path
  * @param algorithm - Signing algorithm (schnorr or ecdsa)
  * @param derivationPath - Optional BIP32 derivation path
- * 
+ *
  * The derivation path determines which child key pair is used,
  * allowing different public keys to be generated from the same master key.
  * This is useful for:
@@ -511,7 +541,7 @@ export async function fetchPublicKey(
   algorithm: SigningAlgorithm,
   derivationPath?: string
 ): Promise<PublicKeyResponse> {
-  const url = derivationPath 
+  const url = derivationPath
     ? `${apiUrl}/protected/public_key?algorithm=${algorithm}&derivation_path=${encodeURIComponent(derivationPath)}`
     : `${apiUrl}/protected/public_key?algorithm=${algorithm}`;
 
@@ -526,12 +556,12 @@ export async function fetchPublicKey(
 export async function convertGuestToEmailAccount(
   email: string,
   password: string,
-  name?: string
+  name?: string | null
 ): Promise<void> {
   const conversionData = {
     email,
     password,
-    name
+    ...(name !== undefined && { name })
   };
 
   return authenticatedApiCall<typeof conversionData, void>(
diff --git a/src/lib/attestation.ts b/src/lib/attestation.ts
index ada2056..6594927 100644
--- a/src/lib/attestation.ts
+++ b/src/lib/attestation.ts
@@ -239,8 +239,8 @@ export async function authenticate(
   }
 }
 
- // For localhost we get a fake document and we only need the public key
- const FakeAttestationDocumentSchema = z.object({
+// For localhost we get a fake document and we only need the public key
+const FakeAttestationDocumentSchema = z.object({
   public_key: z.nullable(z.instanceof(Uint8Array))
 });
 
@@ -265,11 +265,12 @@ export async function verifyAttestation(nonce: string): Promise<AttestationDocum
     const apiUrl = getApiUrl();
 
     // With a local backend we get a fake attestation document, so we'll just pretend to authenticate it
-    if (apiUrl && (
-      apiUrl === "http://127.0.0.1:3000" ||
-      apiUrl === "http://localhost:3000" ||
-      apiUrl === "http://0.0.0.0:3000"
-    )) {
+    if (
+      apiUrl &&
+      (apiUrl === "http://127.0.0.1:3000" ||
+        apiUrl === "http://localhost:3000" ||
+        apiUrl === "http://0.0.0.0:3000")
+    ) {
       console.log("DEV MODE: Using fake attestation document");
       const fakeDocument = await fakeAuthenticate(attestationDocumentBase64);
       return fakeDocument as AttestationDocument;
diff --git a/src/lib/attestationForView.ts b/src/lib/attestationForView.ts
index 1ab318a..1199a8a 100644
--- a/src/lib/attestationForView.ts
+++ b/src/lib/attestationForView.ts
@@ -6,7 +6,8 @@ import { validatePcr0Hash, type Pcr0ValidationResult, type PcrConfig } from "./p
 
 export const AWS_ROOT_CERT_DER = awsRootCertDer;
 
-export const EXPECTED_ROOT_CERT_HASH = "641a0321a3e244efe456463195d606317ed7cdcc3c1756e09893f3c68f79bb5b";
+export const EXPECTED_ROOT_CERT_HASH =
+  "641a0321a3e244efe456463195d606317ed7cdcc3c1756e09893f3c68f79bb5b";
 
 export type ParsedAttestationView = {
   moduleId: string;
@@ -59,7 +60,7 @@ export async function parseAttestationForView(
     .filter((pcr) => !pcr.value.match(/^0+$/));
 
   // Find PCR0 and validate it
-  const pcr0 = pcrs.find(pcr => pcr.id === 0);
+  const pcr0 = pcrs.find((pcr) => pcr.id === 0);
   const validatedPcr0Hash = pcr0 ? validatePcr0Hash(pcr0.value, pcrConfig) : null;
 
   // Parse certificates - cabundle first, then leaf certificate
@@ -101,4 +102,4 @@ export async function parseAttestationForView(
     cert0hash,
     validatedPcr0Hash
   };
-}
\ No newline at end of file
+}
diff --git a/src/lib/getAttestation.ts b/src/lib/getAttestation.ts
index ad21bd2..2ee2908 100644
--- a/src/lib/getAttestation.ts
+++ b/src/lib/getAttestation.ts
@@ -17,7 +17,7 @@ function generateNaclKeyPair(): { publicKey: Uint8Array; secretKey: Uint8Array }
   if (testNaclPublicKey && testNaclSecretKey) {
     return {
       publicKey: decode(testNaclPublicKey),
-      secretKey: decode(testNaclSecretKey),
+      secretKey: decode(testNaclSecretKey)
     };
   }
 
@@ -25,7 +25,10 @@ function generateNaclKeyPair(): { publicKey: Uint8Array; secretKey: Uint8Array }
   return nacl.box.keyPair();
 }
 
-export async function getAttestation(forceRefresh?: boolean, apiUrl?: string): Promise<Attestation> {
+export async function getAttestation(
+  forceRefresh?: boolean,
+  apiUrl?: string
+): Promise<Attestation> {
   // Check if we already have a sessionKey and sessionId in sessionstorage
   const sessionKey = sessionStorage.getItem("sessionKey");
   const sessionId = sessionStorage.getItem("sessionId");
diff --git a/src/lib/main.tsx b/src/lib/main.tsx
index 6e9cee4..b6e79dc 100644
--- a/src/lib/main.tsx
+++ b/src/lib/main.tsx
@@ -3,7 +3,12 @@ import * as api from "./api";
 import { createCustomFetch } from "./ai";
 import { getAttestation } from "./getAttestation";
 import { authenticate } from "./attestation";
-import { parseAttestationForView, AWS_ROOT_CERT_DER, EXPECTED_ROOT_CERT_HASH, ParsedAttestationView } from "./attestationForView";
+import {
+  parseAttestationForView,
+  AWS_ROOT_CERT_DER,
+  EXPECTED_ROOT_CERT_HASH,
+  ParsedAttestationView
+} from "./attestationForView";
 import type { AttestationDocument } from "./attestation";
 import type { LoginResponse, ThirdPartyTokenResponse } from "./api";
 import { PcrConfig } from "./pcr";
@@ -16,6 +21,12 @@ export type OpenSecretAuthState = {
 export type OpenSecretContextType = {
   auth: OpenSecretAuthState;
 
+  /**
+   * The client ID for this project/tenant
+   * @description A UUID that identifies which project/tenant this instance belongs to
+   */
+  clientId: string;
+
   /**
    * Authenticates a user with email and password
    * @param email - User's email address
@@ -24,7 +35,7 @@ export type OpenSecretContextType = {
    * @throws {Error} If login fails
    *
    * @description
-   * - Calls the login API endpoint
+   * - Calls the login API endpoint with the configured clientId
    * - Stores access_token and refresh_token in localStorage
    * - Updates the auth state with user information
    * - Throws an error if authentication fails
@@ -95,7 +106,11 @@ export type OpenSecretContextType = {
    * - Updates the auth state with new user information
    * - Preserves all existing data associated with the guest account
    */
-  convertGuestToUserAccount: (email: string, password: string, name?: string) => Promise<void>;
+  convertGuestToUserAccount: (
+    email: string,
+    password: string,
+    name?: string | null
+  ) => Promise<void>;
 
   /**
    * Logs out the current user
@@ -173,8 +188,13 @@ export type OpenSecretContextType = {
   refetchUser: () => Promise<void>;
   changePassword: typeof api.changePassword;
   refreshAccessToken: typeof api.refreshToken;
-  requestPasswordReset: typeof api.requestPasswordReset;
-  confirmPasswordReset: typeof api.confirmPasswordReset;
+  requestPasswordReset: (email: string, hashedSecret: string) => Promise<void>;
+  confirmPasswordReset: (
+    email: string,
+    alphanumericCode: string,
+    plaintextSecret: string,
+    newPassword: string
+  ) => Promise<void>;
   initiateGitHubAuth: (inviteCode: string) => Promise<api.GithubAuthResponse>;
   handleGitHubCallback: (code: string, state: string, inviteCode: string) => Promise<void>;
   initiateGoogleAuth: (inviteCode: string) => Promise<api.GoogleAuthResponse>;
@@ -194,7 +214,7 @@ export type OpenSecretContextType = {
    * @throws {Error} If:
    * - The private key bytes cannot be retrieved
    * - The derivation path is invalid
-   * 
+   *
    * @description
    * - If no derivation path is provided, returns the master private key bytes
    * - Supports both absolute (starting with "m/") and relative paths
@@ -229,9 +249,9 @@ export type OpenSecretContextType = {
   /**
    * Custom fetch function for AI requests that handles encryption
    * and token refreshing.
-   * 
+   *
    * Meant to be used with the OpenAI JS library
-   * 
+   *
    * Example:
    * ```tsx
    * const openai = new OpenAI({
@@ -291,7 +311,7 @@ export type OpenSecretContextType = {
    * Gets and verifies an attestation document from the enclave
    * @returns A promise resolving to the parsed attestation document
    * @throws {Error} If attestation fails or is invalid
-   * 
+   *
    * @description
    * This is a convenience function that:
    * 1. Fetches the attestation document with a random nonce
@@ -308,7 +328,7 @@ export type OpenSecretContextType = {
    * - The user is not authenticated
    * - The audience URL is invalid
    * - The audience URL is not authorized
-   * 
+   *
    * @description
    * - Generates a signed JWT token for use with specific authorized third-party services
    * - The audience must be an pre-authorized URL registered by the developer (e.g. api.devservice.com)
@@ -323,17 +343,18 @@ export const OpenSecretContext = createContext<OpenSecretContextType>({
     loading: true,
     user: undefined
   },
-  signIn: async () => { },
-  signUp: async () => { },
-  signInGuest: async () => { },
+  clientId: "",
+  signIn: async () => {},
+  signUp: async () => {},
+  signInGuest: async () => {},
   signUpGuest: async (): Promise<LoginResponse> => ({
     id: "",
     email: undefined,
     access_token: "",
     refresh_token: ""
   }),
-  convertGuestToUserAccount: async () => { },
-  signOut: async () => { },
+  convertGuestToUserAccount: async () => {},
+  signOut: async () => {},
   get: api.fetchGet,
   put: api.fetchPut,
   list: api.fetchList,
@@ -341,15 +362,15 @@ export const OpenSecretContext = createContext<OpenSecretContextType>({
   verifyEmail: api.verifyEmail,
   requestNewVerificationCode: api.requestNewVerificationCode,
   requestNewVerificationEmail: api.requestNewVerificationCode,
-  refetchUser: async () => { },
+  refetchUser: async () => {},
   changePassword: api.changePassword,
   refreshAccessToken: api.refreshToken,
-  requestPasswordReset: api.requestPasswordReset,
-  confirmPasswordReset: api.confirmPasswordReset,
+  requestPasswordReset: async () => {},
+  confirmPasswordReset: async () => {},
   initiateGitHubAuth: async () => ({ auth_url: "", csrf_token: "" }),
-  handleGitHubCallback: async () => { },
+  handleGitHubCallback: async () => {},
   initiateGoogleAuth: async () => ({ auth_url: "", csrf_token: "" }),
-  handleGoogleCallback: async () => { },
+  handleGoogleCallback: async () => {},
   getPrivateKey: api.fetchPrivateKey,
   getPrivateKeyBytes: api.fetchPrivateKeyBytes,
   getPublicKey: api.fetchPublicKey,
@@ -374,16 +395,22 @@ export const OpenSecretContext = createContext<OpenSecretContextType>({
  * @param props - Configuration properties for the OpenSecret provider
  * @param props.children - React child components to be wrapped by the provider
  * @param props.apiUrl - URL of OpenSecret enclave backend
+ * @param props.clientId - UUID identifying which project/tenant this instance belongs to
+ * @param props.pcrConfig - Optional PCR configuration for attestation validation
  *
  * @remarks
  * This provider manages:
  * - User authentication state
  * - Authentication methods (sign in, sign up, sign out)
  * - Key-value storage operations
+ * - Project/tenant identification via clientId
  *
  * @example
  * ```tsx
- * <OpenSecretProvider apiUrl='https://preview.opensecret.ai'>
+ * <OpenSecretProvider
+ *   apiUrl='https://preview.opensecret.ai'
+ *   clientId='550e8400-e29b-41d4-a716-446655440000'
+ * >
  *   <App />
  * </OpenSecretProvider>
  * ```
@@ -391,24 +418,33 @@ export const OpenSecretContext = createContext<OpenSecretContextType>({
 export function OpenSecretProvider({
   children,
   apiUrl,
+  clientId,
   pcrConfig = {}
 }: {
   children: React.ReactNode;
   apiUrl: string;
+  clientId: string;
   pcrConfig?: PcrConfig;
 }) {
   const [auth, setAuth] = useState<OpenSecretAuthState>({
     loading: true,
     user: undefined
   });
-  const [aiCustomFetch, setAiCustomFetch] = useState<OpenSecretContextType['aiCustomFetch']>();
+  const [aiCustomFetch, setAiCustomFetch] = useState<OpenSecretContextType["aiCustomFetch"]>();
 
   useEffect(() => {
-    if (!apiUrl || apiUrl.trim() === '') {
-      throw new Error('OpenSecretProvider requires a non-empty apiUrl. Please provide a valid API endpoint URL.');
+    if (!apiUrl || apiUrl.trim() === "") {
+      throw new Error(
+        "OpenSecretProvider requires a non-empty apiUrl. Please provide a valid API endpoint URL."
+      );
+    }
+    if (!clientId || clientId.trim() === "") {
+      throw new Error(
+        "OpenSecretProvider requires a non-empty clientId. Please provide a valid project UUID."
+      );
     }
     api.setApiUrl(apiUrl);
-  }, [apiUrl]);
+  }, [apiUrl, clientId]);
 
   // Create aiCustomFetch when user is authenticated
   useEffect(() => {
@@ -452,7 +488,7 @@ export function OpenSecretProvider({
   async function signIn(email: string, password: string) {
     console.log("Signing in");
     try {
-      const { access_token, refresh_token } = await api.fetchLogin(email, password);
+      const { access_token, refresh_token } = await api.fetchLogin(email, password, clientId);
       window.localStorage.setItem("access_token", access_token);
       window.localStorage.setItem("refresh_token", refresh_token);
       await fetchUser();
@@ -468,7 +504,8 @@ export function OpenSecretProvider({
         email,
         password,
         inviteCode,
-        name
+        clientId,
+        name || null
       );
       window.localStorage.setItem("access_token", access_token);
       window.localStorage.setItem("refresh_token", refresh_token);
@@ -482,7 +519,7 @@ export function OpenSecretProvider({
   async function signInGuest(id: string, password: string) {
     console.log("Signing in Guest");
     try {
-      const { access_token, refresh_token } = await api.fetchGuestLogin(id, password);
+      const { access_token, refresh_token } = await api.fetchGuestLogin(id, password, clientId);
       window.localStorage.setItem("access_token", access_token);
       window.localStorage.setItem("refresh_token", refresh_token);
       await fetchUser();
@@ -497,6 +534,7 @@ export function OpenSecretProvider({
       const { access_token, refresh_token, id } = await api.fetchGuestSignUp(
         password,
         inviteCode,
+        clientId
       );
       window.localStorage.setItem("access_token", access_token);
       window.localStorage.setItem("refresh_token", refresh_token);
@@ -508,13 +546,9 @@ export function OpenSecretProvider({
     }
   }
 
-  async function convertGuestToUserAccount(email: string, password: string, name?: string) {
+  async function convertGuestToUserAccount(email: string, password: string, name?: string | null) {
     try {
-      await api.convertGuestToEmailAccount(
-        email,
-        password,
-        name
-      );
+      await api.convertGuestToEmailAccount(email, password, name);
       await fetchUser();
     } catch (error) {
       console.error(error);
@@ -543,7 +577,7 @@ export function OpenSecretProvider({
 
   const initiateGitHubAuth = async (inviteCode: string) => {
     try {
-      return await api.initiateGitHubAuth(inviteCode);
+      return await api.initiateGitHubAuth(clientId, inviteCode);
     } catch (error) {
       console.error("Failed to initiate GitHub auth:", error);
       throw error;
@@ -568,7 +602,7 @@ export function OpenSecretProvider({
 
   const initiateGoogleAuth = async (inviteCode: string) => {
     try {
-      return await api.initiateGoogleAuth(inviteCode);
+      return await api.initiateGoogleAuth(clientId, inviteCode);
     } catch (error) {
       console.error("Failed to initiate Google auth:", error);
       throw error;
@@ -599,12 +633,17 @@ export function OpenSecretProvider({
     }
 
     const data = await response.json();
-    const verifiedDocument = await authenticate(data.attestation_document, AWS_ROOT_CERT_DER, nonce);
+    const verifiedDocument = await authenticate(
+      data.attestation_document,
+      AWS_ROOT_CERT_DER,
+      nonce
+    );
     return parseAttestationForView(verifiedDocument, verifiedDocument.cabundle, pcrConfig);
   };
 
   const value: OpenSecretContextType = {
     auth,
+    clientId,
     signIn,
     signInGuest,
     signOut,
@@ -621,8 +660,14 @@ export function OpenSecretProvider({
     requestNewVerificationEmail: api.requestNewVerificationCode,
     changePassword: api.changePassword,
     refreshAccessToken: api.refreshToken,
-    requestPasswordReset: api.requestPasswordReset,
-    confirmPasswordReset: api.confirmPasswordReset,
+    requestPasswordReset: (email: string, hashedSecret: string) =>
+      api.requestPasswordReset(email, hashedSecret, clientId),
+    confirmPasswordReset: (
+      email: string,
+      alphanumericCode: string,
+      plaintextSecret: string,
+      newPassword: string
+    ) => api.confirmPasswordReset(email, alphanumericCode, plaintextSecret, newPassword, clientId),
     initiateGitHubAuth,
     handleGitHubCallback,
     initiateGoogleAuth,
diff --git a/src/lib/pcr.ts b/src/lib/pcr.ts
index 3646384..423f8f4 100644
--- a/src/lib/pcr.ts
+++ b/src/lib/pcr.ts
@@ -2,36 +2,36 @@
  * Valid PCR0 values for production environments
  */
 const DEFAULT_PCR0_VALUES = [
-    "eeddbb58f57c38894d6d5af5e575fbe791c5bf3bbcfb5df8da8cfcf0c2e1da1913108e6a762112444740b88c163d7f4b",
-    "74ed417f88cb0ca76c4a3d10f278bd010f1d3f95eafb254d4732511bb50e404507a4049b779c5230137e4091a5582271",
-    "9043fcab93b972d3c14ad2dc8fa78ca7ad374fc937c02435681772a003f7a72876bc4d578089b5c4cf3fe9b480f1aabb",
-    "52c3595b151d93d8b159c257301bfd5aa6f49210de0c55a6cd6df5ebeee44e4206cab950500f5d188f7fa14e6d900b75",
-    "91cb67311e910cce68cd5b7d0de77aa40610d87c6681439b44c46c3ff786ae643956ab2c812478a1da8745b259f07a45",
-    "859065ac81b81d3735130ba08b8af72a7256b603fefb74faabae25ed28cca6edcaa7c10ea32b5948d675c18a9b0f2b1d",
-    "acd82a7d3943e23e95a9dc3ce0b0107ea358d6287f9e3afa245622f7c7e3e0a66142a928b6efcc02f594a95366d3a99d"
+  "eeddbb58f57c38894d6d5af5e575fbe791c5bf3bbcfb5df8da8cfcf0c2e1da1913108e6a762112444740b88c163d7f4b",
+  "74ed417f88cb0ca76c4a3d10f278bd010f1d3f95eafb254d4732511bb50e404507a4049b779c5230137e4091a5582271",
+  "9043fcab93b972d3c14ad2dc8fa78ca7ad374fc937c02435681772a003f7a72876bc4d578089b5c4cf3fe9b480f1aabb",
+  "52c3595b151d93d8b159c257301bfd5aa6f49210de0c55a6cd6df5ebeee44e4206cab950500f5d188f7fa14e6d900b75",
+  "91cb67311e910cce68cd5b7d0de77aa40610d87c6681439b44c46c3ff786ae643956ab2c812478a1da8745b259f07a45",
+  "859065ac81b81d3735130ba08b8af72a7256b603fefb74faabae25ed28cca6edcaa7c10ea32b5948d675c18a9b0f2b1d",
+  "acd82a7d3943e23e95a9dc3ce0b0107ea358d6287f9e3afa245622f7c7e3e0a66142a928b6efcc02f594a95366d3a99d"
 ];
 
 /**
  * Valid PCR0 values for development environments
  */
 const DEFAULT_PCR0_VALUES_DEV = [
-    "62c0407056217a4c10764ed9045694c29fa93255d3cc04c2f989cdd9a1f8050c8b169714c71f1118ebce2fcc9951d1a9",
-    "cb95519905443f9f66f05f63c548b61ad1561a27fd5717b69285861aaea3c3063fe12a2571773b67fea3c6c11b4d8ec6",
-    "deb5895831b5e4286f5a2dcf5e9c27383821446f8df2b465f141d10743599be20ba3bb381ce063bf7139cc89f7f61d4c",
-    "70ba26c6af1ec3b57ce80e1adcc0ee96d70224d4c7a078f427895cdf68e1c30f09b5ac4c456588d872f3f21ff77c036b",
-    "669404ea71435b8f498b48db7816a5c2ab1d258b1a77685b11d84d15a73189504d79c4dee13a658de9f4a0cbfc39cfe8",
-    "a791bf92c25ffdfd372660e460a0e238c6778c090672df6509ae4bc065cf8668b6baac6b6a11d554af53ee0ff0172ad5",
-    "c4285443b87b9b12a6cea3bef1064ec060f652b235a297095975af8f134e5ed65f92d70d4616fdec80af9dff48bb9f35"
+  "62c0407056217a4c10764ed9045694c29fa93255d3cc04c2f989cdd9a1f8050c8b169714c71f1118ebce2fcc9951d1a9",
+  "cb95519905443f9f66f05f63c548b61ad1561a27fd5717b69285861aaea3c3063fe12a2571773b67fea3c6c11b4d8ec6",
+  "deb5895831b5e4286f5a2dcf5e9c27383821446f8df2b465f141d10743599be20ba3bb381ce063bf7139cc89f7f61d4c",
+  "70ba26c6af1ec3b57ce80e1adcc0ee96d70224d4c7a078f427895cdf68e1c30f09b5ac4c456588d872f3f21ff77c036b",
+  "669404ea71435b8f498b48db7816a5c2ab1d258b1a77685b11d84d15a73189504d79c4dee13a658de9f4a0cbfc39cfe8",
+  "a791bf92c25ffdfd372660e460a0e238c6778c090672df6509ae4bc065cf8668b6baac6b6a11d554af53ee0ff0172ad5",
+  "c4285443b87b9b12a6cea3bef1064ec060f652b235a297095975af8f134e5ed65f92d70d4616fdec80af9dff48bb9f35"
 ];
 
 export type Pcr0ValidationResult = {
-    isMatch: boolean;
-    text: string;
+  isMatch: boolean;
+  text: string;
 };
 
 export type PcrConfig = {
-    pcr0Values?: string[];
-    pcr0DevValues?: string[];
+  pcr0Values?: string[];
+  pcr0DevValues?: string[];
 };
 
 /**
@@ -41,31 +41,25 @@ export type PcrConfig = {
  * @returns Object containing match status and descriptive text
  */
 export function validatePcr0Hash(hash: string, config?: PcrConfig): Pcr0ValidationResult {
-    const validPcr0Values = [...(config?.pcr0Values || []), ...DEFAULT_PCR0_VALUES];
-    const validPcr0DevValues = [...(config?.pcr0DevValues || []), ...DEFAULT_PCR0_VALUES_DEV];
+  const validPcr0Values = [...(config?.pcr0Values || []), ...DEFAULT_PCR0_VALUES];
+  const validPcr0DevValues = [...(config?.pcr0DevValues || []), ...DEFAULT_PCR0_VALUES_DEV];
 
-    if (validPcr0Values.includes(hash)) {
-        return {
-            isMatch: true,
-            text: "PCR0 matches a known good value"
-        };
-    }
-    
-    if (validPcr0DevValues.includes(hash)) {
-        return {
-            isMatch: true,
-            text: "PCR0 matches development enclave"
-        };
-    }
-    
+  if (validPcr0Values.includes(hash)) {
     return {
-        isMatch: false,
-        text: "PCR0 does not match a known good value"
+      isMatch: true,
+      text: "PCR0 matches a known good value"
     };
-}
-
-
+  }
 
-  
+  if (validPcr0DevValues.includes(hash)) {
+    return {
+      isMatch: true,
+      text: "PCR0 matches development enclave"
+    };
+  }
 
-  
\ No newline at end of file
+  return {
+    isMatch: false,
+    text: "PCR0 does not match a known good value"
+  };
+}
diff --git a/src/lib/signing.test.ts b/src/lib/signing.test.ts
index b7887be..35edcc5 100644
--- a/src/lib/signing.test.ts
+++ b/src/lib/signing.test.ts
@@ -1,28 +1,33 @@
 import { expect, test, beforeEach } from "bun:test";
 import { fetchLogin, signMessage, fetchPublicKey, fetchPrivateKeyBytes } from "./api";
 import { bytesToHex } from "./test/utils";
-import { sha256 } from '@noble/hashes/sha256';
-import { schnorr, secp256k1 } from '@noble/curves/secp256k1';
+import { sha256 } from "@noble/hashes/sha256";
+import { schnorr, secp256k1 } from "@noble/curves/secp256k1";
 
 const TEST_EMAIL = process.env.VITE_TEST_EMAIL;
 const TEST_PASSWORD = process.env.VITE_TEST_PASSWORD;
+const TEST_CLIENT_ID = process.env.VITE_TEST_CLIENT_ID;
+
+if (!TEST_EMAIL || !TEST_PASSWORD || !TEST_CLIENT_ID) {
+  throw new Error("Test credentials must be set in .env.local");
+}
 
 async function setupTestUser() {
-  // Clear any existing tokens first
-  window.localStorage.clear();
-  
-  // Get fresh tokens
-  const { access_token, refresh_token } = await fetchLogin(TEST_EMAIL!, TEST_PASSWORD!);
-  window.localStorage.setItem("access_token", access_token);
-  window.localStorage.setItem("refresh_token", refresh_token);
-  
-  // Add a small delay to ensure tokens are properly set
-  await new Promise(resolve => setTimeout(resolve, 100));
-  
-  // Verify tokens were set correctly
-  const storedToken = window.localStorage.getItem("access_token");
-  if (!storedToken) {
-    throw new Error("Failed to set access token");
+  try {
+    // Try to login
+    const { access_token } = await fetchLogin(TEST_EMAIL!, TEST_PASSWORD!, TEST_CLIENT_ID!);
+    window.localStorage.setItem("access_token", access_token);
+
+    // Add a small delay to ensure tokens are properly set
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    // Verify tokens were set correctly
+    const storedToken = window.localStorage.getItem("access_token");
+    if (!storedToken) {
+      throw new Error("Failed to set access token");
+    }
+  } catch (error: any) {
+    throw new Error("Failed to set up test user: " + error.message);
   }
 }
 
@@ -36,7 +41,7 @@ async function ensureAuthenticated() {
   if (!token) {
     window.localStorage.clear();
     await setupTestUser();
-    await new Promise(resolve => setTimeout(resolve, 200)); // Wait for token to be properly set
+    await new Promise((resolve) => setTimeout(resolve, 200)); // Wait for token to be properly set
   }
 }
 
@@ -47,7 +52,7 @@ async function retryWithAuth<T>(fn: () => Promise<T>, maxRetries = 3): Promise<T
       return await fn();
     } catch (error: any) {
       if (error.message === "No access token available" && i < maxRetries - 1) {
-        await new Promise(resolve => setTimeout(resolve, 500)); // Wait longer between retries
+        await new Promise((resolve) => setTimeout(resolve, 500)); // Wait longer between retries
         continue;
       }
       throw error;
@@ -68,7 +73,7 @@ test("Sign message with Schnorr returns valid signature", async () => {
   // Then sign a message
   const message = new TextEncoder().encode("Hello, World!");
   const response = await signMessage(message, "schnorr");
-  
+
   // Verify we got all fields
   expect(response.signature).toBeDefined();
   expect(response.message_hash).toBeDefined();
@@ -86,11 +91,7 @@ test("Sign message with Schnorr returns valid signature", async () => {
   expect(bytesToHex(localHash)).toBe(response.message_hash.toLowerCase());
 
   // Verify the signature
-  const isValid = schnorr.verify(
-    response.signature,
-    response.message_hash,
-    public_key
-  );
+  const isValid = schnorr.verify(response.signature, response.message_hash, public_key);
   expect(isValid).toBe(true);
 });
 
@@ -106,7 +107,7 @@ test("Sign message with ECDSA returns valid signature", async () => {
   // Then sign a message
   const message = new TextEncoder().encode("Hello, World!");
   const response = await signMessage(message, "ecdsa");
-  
+
   // Verify we got all fields
   expect(response.signature).toBeDefined();
   expect(response.message_hash).toBeDefined();
@@ -124,11 +125,7 @@ test("Sign message with ECDSA returns valid signature", async () => {
   expect(bytesToHex(localHash)).toBe(response.message_hash.toLowerCase());
 
   // Verify the signature using noble/curves
-  const isValid = secp256k1.verify(
-    response.signature,
-    response.message_hash,
-    public_key
-  );
+  const isValid = secp256k1.verify(response.signature, response.message_hash, public_key);
   expect(isValid).toBe(true);
 });
 
@@ -144,16 +141,16 @@ test("Private key endpoints with derivation paths", async () => {
 
   // Test getting private key bytes with valid derivation paths
   const validPaths = [
-    "m/44'/0'/0'/0/0",    // BIP44
-    "m/84'/0'/0'/0/0",    // BIP84
-    "m/49'/0'/0'/0/0",    // BIP49
-    "m/44'/1'/0'/0/0",    // BIP44 testnet
-    "m/44'/60'/0'/0/0",   // BIP44 Ethereum
-    "44'/0'/0'/0/0",      // Relative path
-    "0/0",                // Simple relative path
-    "1/2",                // Relative path with different indices
-    "m",                  // Master key
-    ""                    // Empty path (master key)
+    "m/44'/0'/0'/0/0", // BIP44
+    "m/84'/0'/0'/0/0", // BIP84
+    "m/49'/0'/0'/0/0", // BIP49
+    "m/44'/1'/0'/0/0", // BIP44 testnet
+    "m/44'/60'/0'/0/0", // BIP44 Ethereum
+    "44'/0'/0'/0/0", // Relative path
+    "0/0", // Simple relative path
+    "1/2", // Relative path with different indices
+    "m", // Master key
+    "" // Empty path (master key)
   ];
 
   for (const path of validPaths) {
@@ -178,14 +175,12 @@ test("Private key endpoints with derivation paths", async () => {
       );
       expect(isValid).toBe(true);
 
-      await new Promise(resolve => setTimeout(resolve, 200));
+      await new Promise((resolve) => setTimeout(resolve, 200));
     });
   }
 
   // Test invalid derivation path
-  await expect(fetchPrivateKeyBytes("invalid/path"))
-    .rejects
-    .toThrow("Bad Request");
+  await expect(fetchPrivateKeyBytes("invalid/path")).rejects.toThrow("Bad Request");
 
   // Test signing with derivation path
   await retryWithAuth(async () => {
@@ -221,19 +216,19 @@ test("Private key endpoints with derivation paths", async () => {
   await retryWithAuth(async () => {
     const coinTypes = ["0'", "1'", "60'", "145'"];
     const hardenedKeys = await Promise.all(
-      coinTypes.map(coin => fetchPrivateKeyBytes(`m/44'/${coin}/0'/0/0`))
+      coinTypes.map((coin) => fetchPrivateKeyBytes(`m/44'/${coin}/0'/0/0`))
     );
-    const uniqueKeys = new Set(hardenedKeys.map(k => k.private_key));
+    const uniqueKeys = new Set(hardenedKeys.map((k) => k.private_key));
     expect(uniqueKeys.size).toBe(coinTypes.length);
   });
 
   // Test relative path edge cases
   const relativePathTests = [
-    "0",           // Single level
-    "0/0/0",      // Multiple levels
+    "0", // Single level
+    "0/0/0", // Multiple levels
     "2147483647", // Max index
-    "0'/1/2",     // Mix of hardened and non-hardened
-    "0h/1/2"      // Alternative hardened notation
+    "0'/1/2", // Mix of hardened and non-hardened
+    "0h/1/2" // Alternative hardened notation
   ];
 
   for (const path of relativePathTests) {
@@ -246,22 +241,18 @@ test("Private key endpoints with derivation paths", async () => {
       const pubKey = await fetchPublicKey("schnorr", path);
       const msg = new TextEncoder().encode("Test relative path");
       const sig = await signMessage(msg, "schnorr", path);
-      const isValid = schnorr.verify(
-        sig.signature,
-        sig.message_hash,
-        pubKey.public_key
-      );
+      const isValid = schnorr.verify(sig.signature, sig.message_hash, pubKey.public_key);
       expect(isValid).toBe(true);
     });
   }
 });
 
 test("Sign message fails without authentication", async () => {
-  window.localStorage.removeItem('access_token');
-  window.localStorage.removeItem('refresh_token');
+  window.localStorage.removeItem("access_token");
+  window.localStorage.removeItem("refresh_token");
 
   const message = new TextEncoder().encode("Hello, World!");
-  await expect(signMessage(message, "schnorr")).rejects.toThrow('No access token available');
+  await expect(signMessage(message, "schnorr")).rejects.toThrow("No access token available");
 });
 
 test("Different messages produce different signatures and hashes", async () => {
@@ -269,39 +260,30 @@ test("Different messages produce different signatures and hashes", async () => {
 
   // Get the public key once
   const { public_key } = await fetchPublicKey("schnorr");
-  
+
   const message1 = new TextEncoder().encode("Hello, World!");
   const message2 = new TextEncoder().encode("Different message");
-  
+
   const response1 = await signMessage(message1, "schnorr");
   const response2 = await signMessage(message2, "schnorr");
-  
+
   // Different signatures and hashes
   expect(response1.signature).not.toBe(response2.signature);
   expect(response1.message_hash).not.toBe(response2.message_hash);
 
   // Verify both signatures
-  const isValid1 = schnorr.verify(
-    response1.signature,
-    response1.message_hash,
-    public_key
-  );
+  const isValid1 = schnorr.verify(response1.signature, response1.message_hash, public_key);
   expect(isValid1).toBe(true);
 
-  const isValid2 = schnorr.verify(
-    response2.signature,
-    response2.message_hash,
-    public_key
-  );
+  const isValid2 = schnorr.verify(response2.signature, response2.message_hash, public_key);
   expect(isValid2).toBe(true);
 });
 
 test("Public key remains constant", async () => {
   await setupTestUser();
-  
+
   const response1 = await fetchPublicKey("schnorr");
   const response2 = await fetchPublicKey("schnorr");
-  
+
   expect(response1.public_key).toBe(response2.public_key);
 });
-
diff --git a/src/lib/test/api-url-loader.ts b/src/lib/test/api-url-loader.ts
index 92401d0..6ad58d9 100644
--- a/src/lib/test/api-url-loader.ts
+++ b/src/lib/test/api-url-loader.ts
@@ -10,4 +10,4 @@ if (!apiUrl) {
 // Set the API URL before tests run
 setApiUrl(apiUrl);
 
-console.log("API URL set to:", apiUrl); 
\ No newline at end of file
+console.log("API URL set to:", apiUrl);
diff --git a/src/lib/test/der-loader.ts b/src/lib/test/der-loader.ts
index f57a417..0cfae58 100644
--- a/src/lib/test/der-loader.ts
+++ b/src/lib/test/der-loader.ts
@@ -10,7 +10,7 @@ Bun.plugin({
     build.onLoad({ filter: /\.der$/ }, (args) => {
       console.log("Loading DER file:", args.path);
       const buffer = fs.readFileSync(args.path);
-      const uint8ArrayString = Array.from(buffer).join(',');
+      const uint8ArrayString = Array.from(buffer).join(",");
 
       return {
         loader: "js",
diff --git a/src/lib/test/utils.ts b/src/lib/test/utils.ts
index 67de5f5..a590672 100644
--- a/src/lib/test/utils.ts
+++ b/src/lib/test/utils.ts
@@ -8,6 +8,6 @@ export function hexToBytes(hex: string): Uint8Array {
 
 export function bytesToHex(bytes: Uint8Array): string {
   return Array.from(bytes)
-    .map(b => b.toString(16).padStart(2, '0'))
-    .join('');
-} 
\ No newline at end of file
+    .map((b) => b.toString(16).padStart(2, "0"))
+    .join("");
+}
diff --git a/src/main.tsx b/src/main.tsx
index 92b1164..f8e8d12 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -6,7 +6,10 @@ import { OpenSecretProvider } from "./lib";
 
 createRoot(document.getElementById("root")!).render(
   <StrictMode>
-    <OpenSecretProvider apiUrl={import.meta.env.VITE_OPEN_SECRET_API_URL}>
+    <OpenSecretProvider
+      apiUrl={import.meta.env.VITE_OPEN_SECRET_API_URL}
+      clientId={import.meta.env.VITE_CLIENT_ID}
+    >
       <App />
     </OpenSecretProvider>
   </StrictMode>