diff --git a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
index 1527e084503d4..c2b6807a5833f 100644
--- a/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
+++ b/site/src/pages/CreateWorkspacePage/CreateWorkspacePageViewExperimental.tsx
@@ -608,7 +608,15 @@ export const CreateWorkspacePageViewExperimental: FC<
 
 							<div className="flex flex-col gap-9">
 								{parameters.map((parameter, index) => {
-									const parameterField = `rich_parameter_values.${index}`;
+									const currentParameterValueIndex =
+										form.values.rich_parameter_values?.findIndex(
+											(p) => p.name === parameter.name,
+										) ?? -1;
+									const parameterFieldIndex =
+										currentParameterValueIndex !== -1
+											? currentParameterValueIndex
+											: index;
+									const parameterField = `rich_parameter_values.${parameterFieldIndex}`;
 									const isPresetParameter = presetParameterNames.includes(
 										parameter.name,
 									);
@@ -629,8 +637,13 @@ export const CreateWorkspacePageViewExperimental: FC<
 										return null;
 									}
 
+									// Get the form value by parameter name to ensure correct value mapping
 									const formValue =
-										form.values?.rich_parameter_values?.[index]?.value || "";
+										currentParameterValueIndex !== -1
+											? form.values?.rich_parameter_values?.[
+													currentParameterValueIndex
+												]?.value || ""
+											: "";
 
 									return (
 										<DynamicParameter
diff --git a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
index 284267f4487e1..9282bd6bfd2b1 100644
--- a/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
+++ b/site/src/pages/OrganizationSettingsPage/IdpSyncPage/IdpGroupSyncForm.tsx
@@ -32,6 +32,7 @@ import { useFormik } from "formik";
 import { Plus, Trash, TriangleAlert } from "lucide-react";
 import { type FC, type KeyboardEventHandler, useId, useState } from "react";
 import { docs } from "utils/docs";
+import { isEveryoneGroup } from "utils/groups";
 import { isUUID } from "utils/uuid";
 import * as Yup from "yup";
 import { ExportPolicyButton } from "./ExportPolicyButton";
@@ -259,15 +260,17 @@ export const IdpGroupSyncForm: FC<IdpGroupSyncFormProps> = ({
 							className="min-w-60 max-w-3xl"
 							value={coderGroups}
 							onChange={setCoderGroups}
-							options={groups.map((group) => ({
-								label: group.display_name || group.name,
-								value: group.id,
-							}))}
+							options={groups
+								.filter((group) => !isEveryoneGroup(group))
+								.map((group) => ({
+									label: group.display_name || group.name,
+									value: group.id,
+								}))}
 							hidePlaceholderWhenSelected
 							placeholder="Select group"
 							emptyIndicator={
 								<p className="text-center text-md text-content-primary">
-									All groups selected
+									No more groups to select
 								</p>
 							}
 						/>