diff --git a/src/pages/admin/ApprovalWorkflowConfig.tsx b/src/pages/admin/ApprovalWorkflowConfig.tsx
index d138510..f93434a 100644
--- a/src/pages/admin/ApprovalWorkflowConfig.tsx
+++ b/src/pages/admin/ApprovalWorkflowConfig.tsx
@@ -6,19 +6,12 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { Switch } from "@/components/ui/switch";
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
-import { Plus, Trash2, Loader2, ChevronRight, Settings2, ArrowRight } from "lucide-react";
-import { approvalsService, type ApprovalWorkflow } from "@/services/approvals.service";
+import { Plus, Trash2, Loader2, Settings2, ArrowRight } from "lucide-react";
+import { approvalsService, type ApprovalWorkflow, type ApprovalStage } from "@/services/approvals.service";
 import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
 import { useToast } from "@/hooks/use-toast";
 
-interface WorkflowStage {
-  order: number;
-  approver_id: number;
-  approver_name: string;
-  max_days?: number;
-  notification_email?: string;
-  auto_escalate?: boolean;
-}
+type WorkflowStage = Omit<ApprovalStage, "order"> & { order: number };
 
 export default function ApprovalWorkflowConfig() {
   const { toast } = useToast();
@@ -28,16 +21,21 @@ export default function ApprovalWorkflowConfig() {
     queryKey: ["approvals", "list"],
     queryFn: () => approvalsService.list(),
   });
-  const workflows = workflowsData?.results ?? [];
+  const workflows: ApprovalWorkflow[] = workflowsData?.results ?? workflowsData?.items ?? [];
+
+  type WorkflowWriteInput = Partial<ApprovalWorkflow> & {
+    steps?: Partial<ApprovalStage>[];
+    bypass_enabled?: boolean;
+  };
 
   const createWorkflow = useMutation({
-    mutationFn: (data: Partial<ApprovalWorkflow>) => approvalsService.create(data),
+    mutationFn: (data: WorkflowWriteInput) => approvalsService.create(data),
     onSuccess: () => qc.invalidateQueries({ queryKey: ["approvals"] }),
     onError: () => toast({ title: "Error", description: "Failed to create workflow", variant: "destructive" }),
   });
 
   const updateWorkflow = useMutation({
-    mutationFn: ({ id, data }: { id: number; data: Partial<ApprovalWorkflow> }) => approvalsService.update(id, data),
+    mutationFn: ({ id, data }: { id: number; data: WorkflowWriteInput }) => approvalsService.update(id, data),
     onSuccess: () => qc.invalidateQueries({ queryKey: ["approvals"] }),
     onError: () => toast({ title: "Error", description: "Failed to update workflow", variant: "destructive" }),
   });
@@ -72,8 +70,26 @@ export default function ApprovalWorkflowConfig() {
   };
 
   const handleCreate = () => {
+    const valid = stages.filter(s => s.approver_id > 0);
+    if (valid.length === 0) {
+      toast({ title: "Validation", description: "Add at least one stage with an approver ID", variant: "destructive" });
+      return;
+    }
     createWorkflow.mutate(
-      { name: wfName, steps: stages.map(s => ({ order: s.order, approver_id: s.approver_id, approver_name: s.approver_name })), status: "draft" } as Partial<ApprovalWorkflow>,
+      {
+        name: wfName,
+        status: "draft",
+        allow_bypass: bypassEnabled,
+        bypass_enabled: bypassEnabled,
+        steps: valid.map(s => ({
+          order: s.order,
+          approver_id: s.approver_id,
+          approver_name: s.approver_name,
+          max_days: s.max_days,
+          auto_escalate: s.auto_escalate,
+          notification_email: s.notification_email,
+        })),
+      },
       { onSuccess: () => { toast({ title: "Workflow Created" }); setShowCreate(false); resetForm(); } },
     );
   };
diff --git a/src/services/approvals.service.ts b/src/services/approvals.service.ts
index c3cd73d..fb36733 100644
--- a/src/services/approvals.service.ts
+++ b/src/services/approvals.service.ts
@@ -1,30 +1,66 @@
 import { api } from "@/lib/api-client";
-import type { PaginatedResponse, PaginationParams, ApiSuccessResponse } from "@/types";
+import type { PaginationParams, ApiSuccessResponse } from "@/types";
+
+export interface ApprovalStage {
+  id?: number;
+  /** 1-based UI position; serialized alongside sequence for compatibility. */
+  order: number;
+  sequence?: number;
+  approver_id: number;
+  approver_name: string;
+  max_days?: number;
+  auto_escalate?: boolean;
+  notification_email?: string;
+  status?: "pending" | "approved" | "rejected" | "skipped";
+  comment?: string;
+  acted_at?: string | null;
+}
 
 export interface ApprovalWorkflow {
   id: number;
   name: string;
-  entity_id: number;
-  entity_name: string;
-  steps: { order: number; approver_id: number; approver_name: string }[];
-  status: "active" | "draft";
+  type?: string;
+  entity_id: number | null;
+  entity_name: string | null;
+  steps: ApprovalStage[];
+  status: "draft" | "active" | "archived";
+  allow_bypass?: boolean;
+  stage_count?: number;
+  request_count?: number;
   created_at: string;
 }
 
+export interface ApprovalWorkflowListResponse {
+  items?: ApprovalWorkflow[];
+  results?: ApprovalWorkflow[];
+  total: number;
+}
+
 export const approvalsService = {
-  async list(params?: PaginationParams): Promise<PaginatedResponse<ApprovalWorkflow>> {
-    return api.get<PaginatedResponse<ApprovalWorkflow>>("/approval-workflows", params as Record<string, string | number | boolean | undefined>);
+  async list(params?: PaginationParams & { status?: string; entity_id?: number }): Promise<ApprovalWorkflowListResponse> {
+    return api.get<ApprovalWorkflowListResponse>(
+      "/approval-workflows",
+      params as Record<string, string | number | boolean | undefined>,
+    );
   },
 
-  async create(data: Partial<ApprovalWorkflow>): Promise<ApprovalWorkflow> {
+  async get(id: number): Promise<ApprovalWorkflow> {
+    return api.get<ApprovalWorkflow>(`/approval-workflows/${id}`);
+  },
+
+  async create(data: Partial<ApprovalWorkflow> & { steps?: Partial<ApprovalStage>[]; bypass_enabled?: boolean }): Promise<ApprovalWorkflow> {
     return api.post<ApprovalWorkflow>("/approval-workflows", data);
   },
 
-  async update(id: number, data: Partial<ApprovalWorkflow>): Promise<ApprovalWorkflow> {
+  async update(id: number, data: Partial<ApprovalWorkflow> & { steps?: Partial<ApprovalStage>[]; bypass_enabled?: boolean }): Promise<ApprovalWorkflow> {
     return api.patch<ApprovalWorkflow>(`/approval-workflows/${id}`, data);
   },
 
   async delete(id: number): Promise<ApiSuccessResponse> {
     return api.delete<ApiSuccessResponse>(`/approval-workflows/${id}`);
   },
+
+  async listUsers(search?: string): Promise<{ items: { id: number; name: string; login: string; email?: string }[]; total: number }> {
+    return api.get("/approval-users", search ? { search } : undefined);
+  },
 };