diff --git a/src/components/resource-policy/PolicyAuthStackSectionCreate.tsx b/src/components/resource-policy/PolicyAuthStackSectionCreate.tsx
index c462cd9ae..9deb74998 100644
--- a/src/components/resource-policy/PolicyAuthStackSectionCreate.tsx
+++ b/src/components/resource-policy/PolicyAuthStackSectionCreate.tsx
@@ -123,7 +123,7 @@ export function PolicyAuthStackSectionCreate({
                         }
                         allIdps={allIdps}
                         rolesEditor={
-                            <FormField
+                            <FormField<PolicyFormValues, "roles">
                                 control={parentForm.control}
                                 name="roles"
                                 render={({ field }) => (
@@ -146,7 +146,7 @@ export function PolicyAuthStackSectionCreate({
                             />
                         }
                         usersEditor={
-                            <FormField
+                            <FormField<PolicyFormValues, "users">
                                 control={parentForm.control}
                                 name="users"
                                 render={({ field }) => (
diff --git a/src/components/resource-policy/PolicyAuthStackSectionEdit.tsx b/src/components/resource-policy/PolicyAuthStackSectionEdit.tsx
index f24e4360d..2140ad445 100644
--- a/src/components/resource-policy/PolicyAuthStackSectionEdit.tsx
+++ b/src/components/resource-policy/PolicyAuthStackSectionEdit.tsx
@@ -662,7 +662,8 @@ export function PolicyAuthStackSectionEdit({
                                           user: headerAuth.user,
                                           password: headerAuth.password,
                                           extendedCompatibility:
-                                              headerAuth.extendedCompatibility
+                                              headerAuth.extendedCompatibility ??
+                                              true
                                       }
                                     : undefined
                             }