diff --git a/frontend/src/pages/class-detail/EditClassModal.tsx b/frontend/src/pages/class-detail/EditClassModal.tsx
index b9125f3ee..52b54d87a 100644
--- a/frontend/src/pages/class-detail/EditClassModal.tsx
+++ b/frontend/src/pages/class-detail/EditClassModal.tsx
@@ -343,7 +343,10 @@ export function EditClassModal({
                 name_first: name_first.trim(),
                 name_last: name_last.trim(),
                 username: username.trim(),
-                role: 'facility_admin'
+                role: 'facility_admin',
+                // An admin who can switch facilities must name one, or the
+                // server answers "facility selection is required".
+                facility_id: cls.facility_id
             },
             provider_platforms: []
         })) as ServerResponseOne<NewUserResponse>;
diff --git a/frontend/src/pages/programs/ClassManagementForm.tsx b/frontend/src/pages/programs/ClassManagementForm.tsx
index f330c2d43..02a83a132 100644
--- a/frontend/src/pages/programs/ClassManagementForm.tsx
+++ b/frontend/src/pages/programs/ClassManagementForm.tsx
@@ -437,7 +437,10 @@ export function ClassManagementFormInner({
                 name_first: name_first.trim(),
                 name_last: name_last.trim(),
                 username: username.trim(),
-                role: 'facility_admin'
+                role: 'facility_admin',
+                // An admin who can switch facilities must name one, or the
+                // server answers "facility selection is required".
+                facility_id: resolvedFacilityId
             },
             provider_platforms: []
         });