diff --git a/App/app/(portal)/admin/accounts/account-form.tsx b/App/app/(portal)/admin/accounts/account-form.tsx
index f2fec2c..a2311bb 100644
--- a/App/app/(portal)/admin/accounts/account-form.tsx
+++ b/App/app/(portal)/admin/accounts/account-form.tsx
@@ -50,7 +50,7 @@ export function AddAccountButton() {
     setError("");
     const result = await createAccount(new FormData(e.currentTarget));
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   return (
@@ -94,7 +94,7 @@ export function EditAccountButton({ account }: { account: AccountRow }) {
     fd.set("id", account.id);
     const result = await updateAccount(fd);
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   async function handleToggle() {
diff --git a/App/app/(portal)/admin/products/product-form.tsx b/App/app/(portal)/admin/products/product-form.tsx
index 43839de..06965c2 100644
--- a/App/app/(portal)/admin/products/product-form.tsx
+++ b/App/app/(portal)/admin/products/product-form.tsx
@@ -49,7 +49,7 @@ export function AddProductButton() {
     setError("");
     const result = await createProduct(new FormData(e.currentTarget));
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   return (
diff --git a/App/app/(portal)/admin/sites/site-form.tsx b/App/app/(portal)/admin/sites/site-form.tsx
index 6467d02..f60e204 100644
--- a/App/app/(portal)/admin/sites/site-form.tsx
+++ b/App/app/(portal)/admin/sites/site-form.tsx
@@ -52,7 +52,7 @@ export function AddSiteButton() {
     e.preventDefault(); setPending(true); setError("");
     const result = await createSite(new FormData(e.currentTarget));
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   return (
@@ -84,7 +84,7 @@ export function EditSiteButton({ site }: { site: SiteRow }) {
     e.preventDefault(); setPending(true); setError("");
     const result = await updateSite(site.id, new FormData(e.currentTarget));
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   async function handleToggle() {
diff --git a/App/app/(portal)/admin/users/user-form.tsx b/App/app/(portal)/admin/users/user-form.tsx
index ce08043..f1950a6 100644
--- a/App/app/(portal)/admin/users/user-form.tsx
+++ b/App/app/(portal)/admin/users/user-form.tsx
@@ -75,7 +75,7 @@ export function AddUserButton() {
     setError("");
     const result = await createUser(new FormData(e.currentTarget));
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   return (
@@ -119,7 +119,7 @@ export function EditUserButton({ user }: { user: UserRow }) {
     fd.set("id", user.id);
     const result = await updateUser(fd);
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   async function handleToggle() {
diff --git a/App/app/(portal)/admin/vendors/vendor-form.tsx b/App/app/(portal)/admin/vendors/vendor-form.tsx
index 40cf34b..c5e2abd 100644
--- a/App/app/(portal)/admin/vendors/vendor-form.tsx
+++ b/App/app/(portal)/admin/vendors/vendor-form.tsx
@@ -253,7 +253,7 @@ export function AddVendorButton() {
     e.preventDefault(); setPending(true); setError("");
     const result = await createVendor(new FormData(e.currentTarget));
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   return (
@@ -292,7 +292,7 @@ export function EditVendorButton({ vendor }: { vendor: VendorRow }) {
     fd.set("id", vendor.id);
     const result = await updateVendor(fd);
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   async function handleToggle() { await toggleVendorActive(vendor.id); router.refresh(); }
diff --git a/App/app/(portal)/admin/vessels/vessel-form.tsx b/App/app/(portal)/admin/vessels/vessel-form.tsx
index 8e2f9dc..e028f3d 100644
--- a/App/app/(portal)/admin/vessels/vessel-form.tsx
+++ b/App/app/(portal)/admin/vessels/vessel-form.tsx
@@ -35,7 +35,7 @@ export function AddVesselButton() {
     setError("");
     const result = await createVessel(new FormData(e.currentTarget));
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   return (
@@ -79,7 +79,7 @@ export function EditVesselButton({ vessel }: { vessel: VesselRow }) {
     fd.set("id", vessel.id);
     const result = await updateVessel(fd);
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { setOpen(false); router.refresh(); }
+    else { setPending(false); setOpen(false); router.refresh(); }
   }
 
   async function handleToggle() {
diff --git a/App/app/(portal)/payments/payment-actions.tsx b/App/app/(portal)/payments/payment-actions.tsx
index 92068d3..73f179f 100644
--- a/App/app/(portal)/payments/payment-actions.tsx
+++ b/App/app/(portal)/payments/payment-actions.tsx
@@ -26,7 +26,7 @@ export function PaymentActions({ poId, poStatus, totalAmount = 0, paidAmount = 0
     setError("");
     const result = await processPayment({ poId });
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { router.refresh(); }
+    else { setPending(false); router.refresh(); }
   }
 
   async function handleMarkPaid(e: React.FormEvent, forceFullPayment = false) {
@@ -48,7 +48,7 @@ export function PaymentActions({ poId, poStatus, totalAmount = 0, paidAmount = 0
     setError("");
     const result = await markPaid({ poId, paymentRef: ref, paymentAmount });
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { router.refresh(); }
+    else { setPending(false); router.refresh(); }
   }
 
   if (poStatus === "MGR_APPROVED") {
diff --git a/App/app/(portal)/po/[id]/vendor-id-form.tsx b/App/app/(portal)/po/[id]/vendor-id-form.tsx
index f8ef843..f22df8b 100644
--- a/App/app/(portal)/po/[id]/vendor-id-form.tsx
+++ b/App/app/(portal)/po/[id]/vendor-id-form.tsx
@@ -25,7 +25,7 @@ export function VendorIdForm({ poId, vendors }: { poId: string; vendors: Vendor[
     setError("");
     const result = await provideVendorId({ poId, vendorId: selectedVendorId });
     if ("error" in result) { setError(result.error); setPending(false); }
-    else { router.refresh(); }
+    else { setPending(false); router.refresh(); }
   }
 
   return (