diff --git a/src/lib/forms-shared.ts b/src/lib/forms-shared.ts
index 978c481..2749753 100644
--- a/src/lib/forms-shared.ts
+++ b/src/lib/forms-shared.ts
@@ -355,3 +355,16 @@ export async function fetchCaseCustomValues(caseId: string): Promise<Record<stri
   });
   return map;
 }
+
+export async function fetchClientCustomValues(clientId: string): Promise<Record<string, string>> {
+  const { data } = await supabase
+    .from("client_field_values")
+    .select("value, field:custom_client_fields(key)")
+    .eq("client_id", clientId);
+  const map: Record<string, string> = {};
+  (data ?? []).forEach((row: any) => {
+    const k = row.field?.key;
+    if (k) map[k] = row.value ?? "";
+  });
+  return map;
+}