diff --git a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx
index 3e24d35b..fe4410e0 100644
--- a/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx
+++ b/apps/dashboard/src/app/(dashboard)/status-pages/[id]/status-reports/[reportId]/page.tsx
@@ -27,8 +27,10 @@ import {
 } from "@/components/forms/status-report-update/form-status-report";
 import { FormSheetStatusReportUpdate } from "@/components/forms/status-report-update/sheet";
 import {
+  defaultComponentImpacts,
   getNextStatus,
   impactsEqual,
+  toCreateStatusReportUpdateInput,
 } from "@/data/status-report-updates.client";
 import { useTRPC } from "@/lib/trpc/client";
 
@@ -104,36 +106,24 @@ export default function Page() {
           <FormSheetStatusReportUpdate
             defaultValues={{
               status: nextStatus,
-              componentImpacts: statusReport.pageComponents.map((c) => ({
-                pageComponentId: c.id,
-                impact:
-                  nextStatus === "resolved"
-                    ? "operational"
-                    : (currentImpacts.get(c.id) ?? "operational"),
-              })),
+              componentImpacts: defaultComponentImpacts({
+                components: statusReport.pageComponents,
+                currentImpacts,
+                nextStatus,
+              }),
             }}
             components={statusReport.pageComponents.map((c) => ({
               id: c.id,
               name: c.name,
             }))}
             onSubmit={async (values: FormValues) => {
-              // a legacy report stays legacy unless the operator actively
-              // sets a non-operational impact — never silently flip it green
-              const sendImpacts =
-                reportHasImpacts ||
-                values.componentImpacts?.some(
-                  (ci) => ci.impact !== "operational",
-                );
-              await createStatusReportUpdateMutation.mutateAsync({
-                statusReportId: statusReport.id,
-                message: values.message,
-                status: values.status,
-                componentImpacts: sendImpacts
-                  ? values.componentImpacts
-                  : undefined,
-                date: values.date,
-                notifySubscribers: values.notifySubscribers,
-              });
+              await createStatusReportUpdateMutation.mutateAsync(
+                toCreateStatusReportUpdateInput({
+                  statusReportId: statusReport.id,
+                  values,
+                  reportHasImpacts,
+                }),
+              );
             }}
           >
             <Button size="sm">
diff --git a/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx b/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx
index 01b908cc..884b0833 100644
--- a/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx
+++ b/apps/dashboard/src/components/data-table/status-report-updates/data-table.tsx
@@ -25,7 +25,12 @@ import { ProcessMessage } from "@/components/content/process-message";
 import { TableCellDate } from "@/components/data-table/table-cell-date";
 import { FormSheetStatusReportUpdate } from "@/components/forms/status-report-update/sheet";
 import { icons } from "@/data/icons";
-import { colors, getNextStatus } from "@/data/status-report-updates.client";
+import {
+  colors,
+  defaultComponentImpacts,
+  getNextStatus,
+  toCreateStatusReportUpdateInput,
+} from "@/data/status-report-updates.client";
 import { useTRPC } from "@/lib/trpc/client";
 import { cn } from "@/lib/utils";
 
@@ -45,6 +50,9 @@ export function DataTable({
 }) {
   const reportHasImpacts = updates.some((u) => u.componentImpacts.length > 0);
   const currentImpacts = currentImpactsFromUpdates(updates);
+  const nextStatus = getNextStatus(
+    updates[updates.length - 1]?.status ?? "investigating",
+  );
   const trpc = useTRPC();
   const { id } = useParams<{ id: string }>();
   const queryClient = useQueryClient();
@@ -88,33 +96,22 @@ export function DataTable({
               <Tooltip>
                 <FormSheetStatusReportUpdate
                   defaultValues={{
-                    status: getNextStatus(
-                      updates[updates.length - 1]?.status ?? "investigating",
-                    ),
-                    componentImpacts: components.map((c) => ({
-                      pageComponentId: c.id,
-                      impact: currentImpacts.get(c.id) ?? "operational",
-                    })),
+                    status: nextStatus,
+                    componentImpacts: defaultComponentImpacts({
+                      components,
+                      currentImpacts,
+                      nextStatus,
+                    }),
                   }}
                   components={components}
                   onSubmit={async (values) => {
-                    // a legacy report stays legacy unless the operator
-                    // actively sets a non-operational impact
-                    const sendImpacts =
-                      reportHasImpacts ||
-                      values.componentImpacts?.some(
-                        (ci) => ci.impact !== "operational",
-                      );
-                    await createStatusReportUpdateMutation.mutateAsync({
-                      statusReportId: reportId,
-                      message: values.message,
-                      status: values.status,
-                      componentImpacts: sendImpacts
-                        ? values.componentImpacts
-                        : undefined,
-                      date: values.date,
-                      notifySubscribers: values.notifySubscribers,
-                    });
+                    await createStatusReportUpdateMutation.mutateAsync(
+                      toCreateStatusReportUpdateInput({
+                        statusReportId: reportId,
+                        values,
+                        reportHasImpacts,
+                      }),
+                    );
                   }}
                 >
                   <TooltipTrigger asChild>
diff --git a/apps/dashboard/src/components/forms/components/update.tsx b/apps/dashboard/src/components/forms/components/update.tsx
index bea15cff..10261ef8 100644
--- a/apps/dashboard/src/components/forms/components/update.tsx
+++ b/apps/dashboard/src/components/forms/components/update.tsx
@@ -27,18 +27,20 @@ export function FormComponentsUpdate() {
   );
   const { data: workspace } = useQuery(trpc.workspace.get.queryOptions());
 
+  // Remount the form after save. Newly-added components/groups get
+  // `Date.now()` placeholder ids (see `form-components.tsx`). The
+  // server returns real ids, but RHF only reads `defaultValues` on
+  // mount — without a remount the next save would round-trip the
+  // placeholders, causing the server's diff to treat real rows as
+  // "removed" (delete) and placeholders as "new" (create).
+  const refetchAndRemount = async (...refetches: Promise<unknown>[]) => {
+    await Promise.all(refetches);
+    setFormKey((k) => k + 1);
+  };
+
   const updateComponentsMutation = useMutation(
     trpc.pageComponent.updateOrder.mutationOptions({
-      onSuccess: async () => {
-        // Remount the form after save. Newly-added components/groups get
-        // `Date.now()` placeholder ids (see `form-components.tsx`). The
-        // server returns real ids, but RHF only reads `defaultValues` on
-        // mount — without a remount the next save would round-trip the
-        // placeholders, causing the server's diff to treat real rows as
-        // "removed" (delete) and placeholders as "new" (create).
-        await Promise.all([refetch(), refetchComponents()]);
-        setFormKey((k) => k + 1);
-      },
+      onSuccess: () => refetchAndRemount(refetch(), refetchComponents()),
     }),
   );
 
@@ -50,10 +52,8 @@ export function FormComponentsUpdate() {
 
   const importMutation = useMutation(
     trpc.import.run.mutationOptions({
-      onSuccess: async () => {
-        await Promise.all([refetch(), refetchComponents(), refetchMonitors()]);
-        setFormKey((k) => k + 1);
-      },
+      onSuccess: () =>
+        refetchAndRemount(refetch(), refetchComponents(), refetchMonitors()),
     }),
   );
 
diff --git a/apps/dashboard/src/components/forms/monitor/form-general.tsx b/apps/dashboard/src/components/forms/monitor/form-general.tsx
index aeb4ae5e..ab01845e 100644
--- a/apps/dashboard/src/components/forms/monitor/form-general.tsx
+++ b/apps/dashboard/src/components/forms/monitor/form-general.tsx
@@ -239,7 +239,8 @@ export function FormGeneral({
                   </FormControl>
                   <FormMessage />
                   <FormDescription>
-                    Displayed on the status page.
+                    Internal name for your monitor. This will be used to
+                    identify the monitor in the dashboard.
                   </FormDescription>
                 </FormItem>
               )}
diff --git a/apps/dashboard/src/data/status-report-updates.client.ts b/apps/dashboard/src/data/status-report-updates.client.ts
index c95a27be..d6612d4f 100644
--- a/apps/dashboard/src/data/status-report-updates.client.ts
+++ b/apps/dashboard/src/data/status-report-updates.client.ts
@@ -2,6 +2,8 @@ import type { StatusReportStatus } from "@openstatus/db/src/schema";
 import type { PageComponentImpact } from "@openstatus/db/src/schema/page_components/constants";
 import { Cog, Trash2 } from "lucide-react";
 
+import type { FormValues as StatusReportUpdateFormValues } from "@/components/forms/status-report-update/form";
+
 export const impactConfig = {
   operational: {
     label: "Operational",
@@ -105,3 +107,45 @@ export function getNextStatus(currentStatus: string): StatusReportStatus {
     statusProgression[currentStatus as StatusReportStatus] ?? "investigating"
   );
 }
+
+export function defaultComponentImpacts({
+  components,
+  currentImpacts,
+  nextStatus,
+}: {
+  components: { id: number }[];
+  currentImpacts: Map<number, PageComponentImpact>;
+  nextStatus: StatusReportStatus;
+}): NonNullable<StatusReportUpdateFormValues["componentImpacts"]> {
+  return components.map((c) => ({
+    pageComponentId: c.id,
+    impact:
+      nextStatus === "resolved"
+        ? "operational"
+        : (currentImpacts.get(c.id) ?? "operational"),
+  }));
+}
+
+// a legacy report stays legacy unless the operator actively sets a
+// non-operational impact — never silently flip it green
+export function toCreateStatusReportUpdateInput({
+  statusReportId,
+  values,
+  reportHasImpacts,
+}: {
+  statusReportId: number;
+  values: StatusReportUpdateFormValues;
+  reportHasImpacts: boolean;
+}) {
+  const sendImpacts =
+    reportHasImpacts ||
+    values.componentImpacts?.some((ci) => ci.impact !== "operational");
+  return {
+    statusReportId,
+    message: values.message,
+    status: values.status,
+    componentImpacts: sendImpacts ? values.componentImpacts : undefined,
+    date: values.date,
+    notifySubscribers: values.notifySubscribers,
+  };
+}
diff --git a/packages/api/src/router/page.ts b/packages/api/src/router/page.ts
index 1c4c262a..733b425e 100644
--- a/packages/api/src/router/page.ts
+++ b/packages/api/src/router/page.ts
@@ -252,17 +252,14 @@ export const pageRouter = createTRPCRouter({
         });
         const newDomain = input.customDomain;
 
-        if (newDomain && !oldDomain) {
-          await addDomainToVercel(newDomain);
-        } else if (oldDomain && newDomain && newDomain !== oldDomain) {
+        // unchanged saves must be a no-op — re-adding an existing domain fails on Vercel
+        if (newDomain === oldDomain) return;
+
+        if (newDomain) {
           await addDomainToVercel(newDomain);
+        }
+        if (oldDomain) {
           await removeDomainFromVercel(oldDomain);
-        } else if (oldDomain && newDomain === "") {
-          await removeDomainFromVercel(oldDomain);
-        } else if (newDomain) {
-          await addDomainToVercel(newDomain);
-        } else {
-          return;
         }
 
         await updatePageCustomDomain({