diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx
index a41e7b6b87ca2..a1f22fd11a1dd 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesContextualBar.tsx
@@ -75,7 +75,7 @@ const AttributesContextualBar = ({ attributeData, onClose }: AttributesContextua
 			dispatchToastMessage({ type: 'error', message: error });
 		},
 		onSettled: () => {
-			queryClient.invalidateQueries({ queryKey: ABACQueryKeys.roomAttributes.list() });
+			queryClient.invalidateQueries({ queryKey: ABACQueryKeys.roomAttributes.list({}) });
 		},
 	});
 
diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx
index 9e899452914fd..a9b067e52fe61 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesForm.tsx
@@ -102,92 +102,112 @@ const AttributesForm = ({ onSave, onCancel, description }: AttributesFormProps)
 
 	return (
 		<>
-			<ContextualbarScrollableContent>
-				<Box is='form' onSubmit={handleSubmit(onSave)} id={formId}>
-					<Box>{description}</Box>
-					<Field mb={16}>
-						<FieldLabel htmlFor={nameField} required>
-							{t('Name')}
-						</FieldLabel>
-						<FieldRow>
-							<TextInput
-								error={errors.name?.message}
-								id={nameField}
-								{...register('name', { required: t('Required_field', { field: t('Name') }) })}
-							/>
-						</FieldRow>
-						{errors.name && <FieldError>{errors.name.message}</FieldError>}
-					</Field>
-					<Field mb={16}>
-						<FieldLabel required id={valuesField}>
-							{t('Values')}
-						</FieldLabel>
-						{lockedAttributesFields.map((field, index) => (
-							<Fragment key={field.id}>
-								<FieldRow key={field.id}>
-									<TextInput
-										disabled
-										aria-labelledby={valuesField}
-										error={errors.lockedAttributes?.[index]?.value?.message || ''}
-										{...register(`lockedAttributes.${index}.value`, {
-											required: t('Required_field', { field: t('Values') }),
-											validate: (value: string) => validateRepeatedValues(value),
-										})}
-									/>
-									{index !== 0 && (
-										<IconButton title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => removeLockedAttribute(index)} />
-									)}
-								</FieldRow>
-								{errors.lockedAttributes?.[index]?.value && <FieldError>{errors.lockedAttributes?.[index]?.value?.message}</FieldError>}
-								{showDisclaimer.includes(index) && (
-									<FieldError>
-										<Trans
-											i18nKey='ABAC_Cannot_delete_attribute_value_in_use'
-											components={{
-												1: (
-													<Box
-														is='a'
-														onClick={(e) => {
-															e.preventDefault();
-															viewRoomsAction(getValues('name'));
-														}}
-													>
-														{t('ABAC_View_rooms')}
-													</Box>
-												),
-											}}
-										/>
-									</FieldError>
+			<ContextualbarScrollableContent is='form' onSubmit={handleSubmit(onSave)} id={formId}>
+				<Box>{description}</Box>
+				<Field>
+					<FieldLabel htmlFor={nameField} required>
+						{t('Name')}
+					</FieldLabel>
+					<FieldRow>
+						<TextInput
+							error={errors.name?.message}
+							id={nameField}
+							aria-required='true'
+							{...register('name', { required: t('Required_field', { field: t('Name') }) })}
+							aria-invalid={errors.name ? 'true' : 'false'}
+							aria-describedby={errors.name ? `${nameField}-error` : undefined}
+						/>
+					</FieldRow>
+					{errors.name && (
+						<FieldError id={`${nameField}-error`} role='alert'>
+							{errors.name.message}
+						</FieldError>
+					)}
+				</Field>
+				<Field>
+					<FieldLabel required id={valuesField}>
+						{t('Values')}
+					</FieldLabel>
+					{lockedAttributesFields.map((field, index) => (
+						<Fragment key={field.id}>
+							<FieldRow key={field.id}>
+								<TextInput
+									disabled
+									aria-labelledby={valuesField}
+									aria-describedby={errors.lockedAttributes?.[index]?.value ? `${valuesField}-lockedAttr-${index}-error` : undefined}
+									error={errors.lockedAttributes?.[index]?.value?.message || ''}
+									aria-invalid={errors.lockedAttributes?.[index]?.value ? 'true' : 'false'}
+									aria-required='true'
+									{...register(`lockedAttributes.${index}.value`, {
+										required: t('Required_field', { field: t('Values') }),
+										validate: (value: string) => validateRepeatedValues(value),
+									})}
+								/>
+								{index !== 0 && (
+									<IconButton mis={8} small title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => removeLockedAttribute(index)} />
 								)}
-							</Fragment>
-						))}
-						{fields.map((field, index) => (
-							<Fragment key={field.id}>
-								<FieldRow>
-									<TextInput
-										aria-labelledby={valuesField}
-										error={errors.attributeValues?.[index]?.value?.message || ''}
-										{...register(`attributeValues.${index}.value`, {
-											required: t('Required_field', { field: t('Values') }),
-											validate: (value: string) => validateRepeatedValues(value),
-										})}
+							</FieldRow>
+							{errors.lockedAttributes?.[index]?.value && (
+								<FieldError id={`${valuesField}-lockedAttr-${index}-error`} role='alert'>
+									{errors.lockedAttributes?.[index]?.value?.message}
+								</FieldError>
+							)}
+							{showDisclaimer.includes(index) && (
+								<FieldError>
+									<Trans
+										i18nKey='ABAC_Cannot_delete_attribute_value_in_use'
+										components={{
+											1: (
+												<Box
+													is='a'
+													onClick={(e) => {
+														e.preventDefault();
+														viewRoomsAction(getValues('name'));
+													}}
+												>
+													{t('ABAC_View_rooms')}
+												</Box>
+											),
+										}}
 									/>
-									{(index !== 0 || lockedAttributesFields.length > 0) && (
-										<IconButton title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => remove(index)} />
-									)}
-								</FieldRow>
-								{errors.attributeValues?.[index]?.value && <FieldError>{errors.attributeValues[index].value.message}</FieldError>}
-							</Fragment>
-						))}
-						<Button
-							onClick={() => append({ value: '' })}
-							// Checking for values since rhf does consider the newly added field as dirty after an append() call
-							disabled={!!getAttributeValuesError() || attributeValues?.some((value: { value: string }) => value?.value === '')}
-						>
-							{t('Add_Value')}
-						</Button>
-					</Field>
-				</Box>
+								</FieldError>
+							)}
+						</Fragment>
+					))}
+					{fields.map((field, index) => (
+						<Fragment key={field.id}>
+							<FieldRow>
+								<TextInput
+									aria-labelledby={valuesField}
+									aria-describedby={errors.attributeValues?.[index]?.value ? `${valuesField}-attr-${index}-error` : undefined}
+									error={errors.attributeValues?.[index]?.value?.message || ''}
+									aria-invalid={errors.attributeValues?.[index]?.value ? 'true' : 'false'}
+									aria-required='true'
+									{...register(`attributeValues.${index}.value`, {
+										required: t('Required_field', { field: t('Values') }),
+										validate: (value: string) => validateRepeatedValues(value),
+									})}
+								/>
+								{(index !== 0 || lockedAttributesFields.length > 0) && (
+									<IconButton mis={8} small title={t('ABAC_Remove_attribute')} icon='trash' onClick={() => remove(index)} />
+								)}
+							</FieldRow>
+							{errors.attributeValues?.[index]?.value && (
+								<FieldError id={`${valuesField}-attr-${index}-error`} role='alert'>
+									{errors.attributeValues[index].value.message}
+								</FieldError>
+							)}
+						</Fragment>
+					))}
+					<Button
+						mb={8}
+						onClick={() => append({ value: '' })}
+						// Checking for values since rhf does consider the newly added field as dirty after an append() call
+						disabled={!!getAttributeValuesError() || attributeValues?.some((value: { value: string }) => value?.value === '')}
+					>
+						{t('Add_Value')}
+					</Button>
+				</Field>
 			</ContextualbarScrollableContent>
 			<ContextualbarFooter>
 				<ButtonGroup stretch>
diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx
index d77f9b083cf0c..23401eb150b61 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/AttributesPage.tsx
@@ -25,7 +25,7 @@ const AttributesPage = () => {
 	const searchTerm = useSearchParameter('searchTerm');
 	const [text, setText] = useState(searchTerm ?? '');
 
-	const debouncedText = useDebouncedValue(text, 200);
+	const debouncedText = useDebouncedValue(text, 400);
 	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();
 	const getAttributes = useEndpoint('GET', '/v1/abac/attributes');
 	const isABACAvailable = useIsABACAvailable();
diff --git a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
index 3e914b776d6e3..17b7c700a50b5 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACAttributesTab/__snapshots__/AttributesForm.spec.tsx.snap
@@ -26,85 +26,85 @@ exports[`AttributesForm renders NewAttribute without crashing 1`] = `
             style="margin-right: 0px; margin-bottom: 0px; margin-left: 0px; top: 0px; left: 0px; width: calc(100% + 0px); padding: 0px 0px 0px 0px;"
             tabindex="-1"
           >
-            <div
+            <form
               class="rcx-box rcx-box--full rcx-css-iag4sp"
+              id=":r0:"
             >
-              <form
+              <div
                 class="rcx-box rcx-box--full rcx-css-1jggbrp rcx-css-1fuhgt0"
-                id=":r0:"
               >
-                <div
-                  class="rcx-box rcx-box--full"
-                >
-                  Create an attribute that can later be assigned to rooms.
-                </div>
-                <div
-                  class="rcx-box rcx-box--full rcx-field rcx-css-1jagyun"
+                Create an attribute that can later be assigned to rooms.
+              </div>
+              <div
+                class="rcx-box rcx-box--full rcx-field rcx-css-1jggbrp rcx-css-1fuhgt0"
+              >
+                <label
+                  class="rcx-box rcx-box--full rcx-field__label rcx-label"
+                  for=":r1:"
                 >
-                  <label
-                    class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                    for=":r1:"
-                  >
-                    Name
-                    <span
-                      aria-hidden="true"
-                      class="rcx-box rcx-box--full rcx-label__required rcx-css-b7g1a9"
-                    >
-                      *
-                    </span>
-                  </label>
+                  Name
                   <span
-                    class="rcx-box rcx-box--full rcx-field__row"
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-label__required rcx-css-b7g1a9"
                   >
-                    <input
-                      class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                      id=":r1:"
-                      name="name"
-                      size="1"
-                      type="text"
-                    />
+                    *
                   </span>
-                </div>
-                <div
-                  class="rcx-box rcx-box--full rcx-field rcx-css-1jagyun"
+                </label>
+                <span
+                  class="rcx-box rcx-box--full rcx-field__row"
                 >
-                  <label
-                    class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                    id=":r2:"
-                  >
-                    Values
-                    <span
-                      aria-hidden="true"
-                      class="rcx-box rcx-box--full rcx-label__required rcx-css-b7g1a9"
-                    >
-                      *
-                    </span>
-                  </label>
+                  <input
+                    aria-invalid="false"
+                    aria-required="true"
+                    class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
+                    id=":r1:"
+                    name="name"
+                    size="1"
+                    type="text"
+                  />
+                </span>
+              </div>
+              <div
+                class="rcx-box rcx-box--full rcx-field rcx-css-1jggbrp rcx-css-1fuhgt0"
+              >
+                <label
+                  class="rcx-box rcx-box--full rcx-field__label rcx-label"
+                  id=":r2:"
+                >
+                  Values
                   <span
-                    class="rcx-box rcx-box--full rcx-field__row"
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-label__required rcx-css-b7g1a9"
                   >
-                    <input
-                      aria-labelledby=":r2:"
-                      class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                      name="attributeValues.0.value"
-                      size="1"
-                      type="text"
-                    />
+                    *
                   </span>
-                  <button
-                    class="rcx-box rcx-box--full rcx-button"
-                    disabled=""
-                    type="button"
+                </label>
+                <span
+                  class="rcx-box rcx-box--full rcx-field__row"
+                >
+                  <input
+                    aria-invalid="false"
+                    aria-labelledby=":r2:"
+                    aria-required="true"
+                    class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
+                    name="attributeValues.0.value"
+                    size="1"
+                    type="text"
+                  />
+                </span>
+                <button
+                  class="rcx-box rcx-box--full rcx-button rcx-css-cnkcl9"
+                  disabled=""
+                  type="button"
+                >
+                  <span
+                    class="rcx-button--content"
                   >
-                    <span
-                      class="rcx-button--content"
-                    >
-                      Add Value
-                    </span>
-                  </button>
-                </div>
-              </form>
-            </div>
+                    Add Value
+                  </span>
+                </button>
+              </div>
+            </form>
           </div>
           <div
             class="os-scrollbar os-scrollbar-horizontal os-theme-dark os-scrollbar-auto-hide os-scrollbar-auto-hide-hidden os-scrollbar-handle-interactive os-scrollbar-cornerless os-scrollbar-unusable"
@@ -194,133 +194,137 @@ exports[`AttributesForm renders WithLockedAttributes without crashing 1`] = `
             style="margin-right: 0px; margin-bottom: 0px; margin-left: 0px; top: 0px; left: 0px; width: calc(100% + 0px); padding: 0px 0px 0px 0px;"
             tabindex="-1"
           >
-            <div
+            <form
               class="rcx-box rcx-box--full rcx-css-iag4sp"
+              id=":r3:"
             >
-              <form
+              <div
                 class="rcx-box rcx-box--full rcx-css-1jggbrp rcx-css-1fuhgt0"
-                id=":r3:"
               >
-                <div
-                  class="rcx-box rcx-box--full"
-                >
-                  Attribute values cannot be edited, but can be added or deleted.
-                </div>
-                <div
-                  class="rcx-box rcx-box--full rcx-field rcx-css-1jagyun"
+                Attribute values cannot be edited, but can be added or deleted.
+              </div>
+              <div
+                class="rcx-box rcx-box--full rcx-field rcx-css-1jggbrp rcx-css-1fuhgt0"
+              >
+                <label
+                  class="rcx-box rcx-box--full rcx-field__label rcx-label"
+                  for=":r4:"
                 >
-                  <label
-                    class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                    for=":r4:"
-                  >
-                    Name
-                    <span
-                      aria-hidden="true"
-                      class="rcx-box rcx-box--full rcx-label__required rcx-css-b7g1a9"
-                    >
-                      *
-                    </span>
-                  </label>
+                  Name
                   <span
-                    class="rcx-box rcx-box--full rcx-field__row"
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-label__required rcx-css-b7g1a9"
                   >
-                    <input
-                      class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                      id=":r4:"
-                      name="name"
-                      size="1"
-                      type="text"
-                    />
+                    *
                   </span>
-                </div>
-                <div
-                  class="rcx-box rcx-box--full rcx-field rcx-css-1jagyun"
+                </label>
+                <span
+                  class="rcx-box rcx-box--full rcx-field__row"
                 >
-                  <label
-                    class="rcx-box rcx-box--full rcx-field__label rcx-label"
-                    id=":r5:"
-                  >
-                    Values
-                    <span
-                      aria-hidden="true"
-                      class="rcx-box rcx-box--full rcx-label__required rcx-css-b7g1a9"
-                    >
-                      *
-                    </span>
-                  </label>
-                  <span
-                    class="rcx-box rcx-box--full rcx-field__row"
-                  >
-                    <input
-                      aria-labelledby=":r5:"
-                      class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                      disabled=""
-                      name="lockedAttributes.0.value"
-                      size="1"
-                      type="text"
-                    />
-                  </span>
+                  <input
+                    aria-invalid="false"
+                    aria-required="true"
+                    class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
+                    id=":r4:"
+                    name="name"
+                    size="1"
+                    type="text"
+                  />
+                </span>
+              </div>
+              <div
+                class="rcx-box rcx-box--full rcx-field rcx-css-1jggbrp rcx-css-1fuhgt0"
+              >
+                <label
+                  class="rcx-box rcx-box--full rcx-field__label rcx-label"
+                  id=":r5:"
+                >
+                  Values
                   <span
-                    class="rcx-box rcx-box--full rcx-field__row"
+                    aria-hidden="true"
+                    class="rcx-box rcx-box--full rcx-label__required rcx-css-b7g1a9"
                   >
-                    <input
-                      aria-labelledby=":r5:"
-                      class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                      disabled=""
-                      name="lockedAttributes.1.value"
-                      size="1"
-                      type="text"
-                    />
-                    <button
-                      class="rcx-box rcx-box--full rcx-button--large-square rcx-button--square rcx-button--icon rcx-button"
-                      title="ABAC_Remove_attribute"
-                      type="button"
-                    >
-                      <i
-                        aria-hidden="true"
-                        class="rcx-box rcx-box--full rcx-icon--name-trash rcx-icon rcx-css-1x2l7ts"
-                      >
-                        
-                      </i>
-                    </button>
+                    *
                   </span>
-                  <span
-                    class="rcx-box rcx-box--full rcx-field__row"
+                </label>
+                <span
+                  class="rcx-box rcx-box--full rcx-field__row"
+                >
+                  <input
+                    aria-invalid="false"
+                    aria-labelledby=":r5:"
+                    aria-required="true"
+                    class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
+                    disabled=""
+                    name="lockedAttributes.0.value"
+                    size="1"
+                    type="text"
+                  />
+                </span>
+                <span
+                  class="rcx-box rcx-box--full rcx-field__row"
+                >
+                  <input
+                    aria-invalid="false"
+                    aria-labelledby=":r5:"
+                    aria-required="true"
+                    class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
+                    disabled=""
+                    name="lockedAttributes.1.value"
+                    size="1"
+                    type="text"
+                  />
+                  <button
+                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ws1yyr"
+                    title="ABAC_Remove_attribute"
+                    type="button"
                   >
-                    <input
-                      aria-labelledby=":r5:"
-                      class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
-                      disabled=""
-                      name="lockedAttributes.2.value"
-                      size="1"
-                      type="text"
-                    />
-                    <button
-                      class="rcx-box rcx-box--full rcx-button--large-square rcx-button--square rcx-button--icon rcx-button"
-                      title="ABAC_Remove_attribute"
-                      type="button"
+                    <i
+                      aria-hidden="true"
+                      class="rcx-box rcx-box--full rcx-icon--name-trash rcx-icon rcx-css-4pvxx3"
                     >
-                      <i
-                        aria-hidden="true"
-                        class="rcx-box rcx-box--full rcx-icon--name-trash rcx-icon rcx-css-1x2l7ts"
-                      >
-                        
-                      </i>
-                    </button>
-                  </span>
+                      
+                    </i>
+                  </button>
+                </span>
+                <span
+                  class="rcx-box rcx-box--full rcx-field__row"
+                >
+                  <input
+                    aria-invalid="false"
+                    aria-labelledby=":r5:"
+                    aria-required="true"
+                    class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--type-text rcx-input-box"
+                    disabled=""
+                    name="lockedAttributes.2.value"
+                    size="1"
+                    type="text"
+                  />
                   <button
-                    class="rcx-box rcx-box--full rcx-button"
+                    class="rcx-box rcx-box--full rcx-button--small-square rcx-button--square rcx-button--icon rcx-button rcx-css-ws1yyr"
+                    title="ABAC_Remove_attribute"
                     type="button"
                   >
-                    <span
-                      class="rcx-button--content"
+                    <i
+                      aria-hidden="true"
+                      class="rcx-box rcx-box--full rcx-icon--name-trash rcx-icon rcx-css-4pvxx3"
                     >
-                      Add Value
-                    </span>
+                      
+                    </i>
                   </button>
-                </div>
-              </form>
-            </div>
+                </span>
+                <button
+                  class="rcx-box rcx-box--full rcx-button rcx-css-cnkcl9"
+                  type="button"
+                >
+                  <span
+                    class="rcx-button--content"
+                  >
+                    Add Value
+                  </span>
+                </button>
+              </div>
+            </form>
           </div>
           <div
             class="os-scrollbar os-scrollbar-horizontal os-theme-dark os-scrollbar-auto-hide os-scrollbar-auto-hide-hidden os-scrollbar-handle-interactive os-scrollbar-cornerless os-scrollbar-unusable"
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomForm.tsx b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomForm.tsx
index ca427d377ea33..91c45e2779c32 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomForm.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomForm.tsx
@@ -74,47 +74,52 @@ const RoomForm = ({ onClose, onSave, roomInfo, setSelectedRoomLabel }: RoomFormP
 
 	return (
 		<>
-			<ContextualbarScrollableContent>
-				<Box is='form' onSubmit={handleSubmit(handleSave)} id={formId}>
-					<Field mb={16}>
-						<FieldLabel id={nameField} required>
-							{t('ABAC_Room_to_be_managed')}
-						</FieldLabel>
-						<FieldRow>
-							{roomInfo ? (
-								<RoomFormAutocompleteDummy roomInfo={roomInfo} />
-							) : (
-								<Controller
-									name='room'
-									control={control}
-									rules={{ required: t('Required_field', { field: t('ABAC_Room_to_be_managed') }) }}
-									render={({ field }) => (
-										<RoomFormAutocomplete
-											{...field}
-											error={!!errors.room?.message}
-											aria-labelledby={nameField}
-											onSelectedRoom={(value: string, label: string) => {
-												field.onChange(value);
-												setSelectedRoomLabel(label);
-											}}
-										/>
-									)}
-								/>
-							)}
-						</FieldRow>
-						{errors.room && <FieldError>{errors.room.message}</FieldError>}
-					</Field>
-					<RoomFormAttributeFields fields={fields} remove={remove} />
-					<Button
-						w='full'
-						disabled={fields.length >= 10}
-						onClick={() => {
-							append({ key: '', values: [] });
-						}}
-					>
-						{t('ABAC_Add_Attribute')}
-					</Button>
-				</Box>
+			<ContextualbarScrollableContent is='form' onSubmit={handleSubmit(handleSave)} id={formId}>
+				<Field>
+					<FieldLabel id={nameField} required>
+						{t('ABAC_Room_to_be_managed')}
+					</FieldLabel>
+					<FieldRow>
+						{roomInfo ? (
+							<RoomFormAutocompleteDummy roomInfo={roomInfo} />
+						) : (
+							<Controller
+								name='room'
+								control={control}
+								rules={{ required: t('Required_field', { field: t('ABAC_Room_to_be_managed') }) }}
+								render={({ field }) => (
+									<RoomFormAutocomplete
+										{...field}
+										error={!!errors.room?.message}
+										aria-labelledby={nameField}
+										aria-required='true'
+										aria-invalid={errors.room ? 'true' : 'false'}
+										aria-describedby={`${nameField}-error`}
+										onSelectedRoom={(value: string, label: string) => {
+											field.onChange(value);
+											setSelectedRoomLabel(label);
+										}}
+									/>
+								)}
+							/>
+						)}
+					</FieldRow>
+					{errors.room && (
+						<FieldError id={`${nameField}-error`} role='alert'>
+							{errors.room.message}
+						</FieldError>
+					)}
+				</Field>
+				<RoomFormAttributeFields fields={fields} remove={remove} />
+				<Button
+					w='full'
+					disabled={fields.length >= 10}
+					onClick={() => {
+						append({ key: '', values: [] });
+					}}
+				>
+					{t('ABAC_Add_Attribute')}
+				</Button>
 			</ContextualbarScrollableContent>
 			<ContextualbarFooter>
 				<ButtonGroup stretch>
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx
index d9a4247c3db55..21a54fd8539f5 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeField.tsx
@@ -7,12 +7,14 @@ import { useTranslation } from 'react-i18next';
 import type { RoomFormData } from './RoomForm';
 
 type ABACAttributeAutocompleteProps = {
+	labelId: string;
 	onRemove: () => void;
 	index: number;
 	attributeList: { value: string; label: string; attributeValues: string[] }[];
+	required?: boolean;
 };
 
-const RoomFormAttributeField = ({ onRemove, index, attributeList }: ABACAttributeAutocompleteProps) => {
+const RoomFormAttributeField = ({ labelId, onRemove, index, attributeList, required = false }: ABACAttributeAutocompleteProps) => {
 	const { t } = useTranslation();
 
 	const { control, getValues, resetField } = useFormContext<RoomFormData>();
@@ -60,6 +62,11 @@ const RoomFormAttributeField = ({ onRemove, index, attributeList }: ABACAttribut
 				<SelectFiltered
 					{...keyField}
 					options={options}
+					required={required}
+					aria-required={required}
+					aria-labelledby={labelId}
+					aria-invalid={keyFieldState.error ? 'true' : 'false'}
+					aria-describedby={keyFieldState.error ? `${keyField.name}-error` : undefined}
 					placeholder={t('ABAC_Search_Attribute')}
 					mbe={4}
 					error={keyFieldState.error?.message}
@@ -70,10 +77,18 @@ const RoomFormAttributeField = ({ onRemove, index, attributeList }: ABACAttribut
 					}}
 				/>
 			</FieldRow>
-			{keyFieldState.error && <FieldError>{keyFieldState.error.message}</FieldError>}
-
+			{keyFieldState.error && (
+				<FieldError id={`${keyField.name}-error`} role='alert'>
+					{keyFieldState.error.message}
+				</FieldError>
+			)}
 			<FieldRow>
 				<MultiSelect
+					required={required}
+					aria-required={required}
+					aria-labelledby={labelId}
+					aria-invalid={valuesFieldState.error ? 'true' : 'false'}
+					aria-describedby={valuesFieldState.error ? `${valuesField.name}-error` : undefined}
 					withTruncatedText
 					{...valuesField}
 					options={valueOptions}
@@ -81,11 +96,16 @@ const RoomFormAttributeField = ({ onRemove, index, attributeList }: ABACAttribut
 					error={valuesFieldState.error?.message}
 				/>
 			</FieldRow>
-			{valuesFieldState.error && <FieldError>{valuesFieldState.error.message}</FieldError>}
-
-			<Button onClick={onRemove} title={t('Remove')} mbs={4}>
-				{t('Remove')}
-			</Button>
+			{valuesFieldState.error && (
+				<FieldError id={`${valuesField.name}-error`} role='alert'>
+					{valuesFieldState.error.message}
+				</FieldError>
+			)}
+			{index !== 0 && (
+				<Button onClick={onRemove} title={t('Remove')} mbs={8}>
+					{t('Remove')}
+				</Button>
+			)}
 		</Box>
 	);
 };
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeFields.tsx b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeFields.tsx
index bfcdf21464b28..49555685329a8 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeFields.tsx
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/RoomFormAttributeFields.tsx
@@ -19,12 +19,14 @@ const RoomFormAttributeFields = ({ fields, remove }: RoomFormAttributeFieldsProp
 	}
 
 	return fields.map((field, index) => (
-		<Field key={field.id} mb={16}>
-			<FieldLabel htmlFor={field.id} required>
+		<Field key={field.id}>
+			<FieldLabel id={field.id} required={index === 0}>
 				{t('Attribute')}
 			</FieldLabel>
 			<RoomFormAttributeField
+				labelId={field.id}
 				attributeList={attributeList.attributes}
+				required={index === 0}
 				onRemove={() => {
 					remove(index);
 				}}
diff --git a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAttributeField.spec.tsx.snap b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAttributeField.spec.tsx.snap
index 999e90812d4e5..988f9bd936828 100644
--- a/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAttributeField.spec.tsx.snap
+++ b/apps/meteor/client/views/admin/ABAC/ABACRoomsTab/__snapshots__/RoomFormAttributeField.spec.tsx.snap
@@ -13,6 +13,8 @@ exports[`RoomFormAttributeField renders Default without crashing 1`] = `
           class="rcx-box rcx-box--full rcx-field__row"
         >
           <div
+            aria-invalid="false"
+            aria-required="false"
             class="rcx-box rcx-box--full rcx-select rcx-css-1hx4au7"
             name="attributes.0.key"
           >
@@ -46,6 +48,8 @@ exports[`RoomFormAttributeField renders Default without crashing 1`] = `
           class="rcx-box rcx-box--full rcx-field__row"
         >
           <div
+            aria-invalid="false"
+            aria-required="false"
             class="rcx-box rcx-box--full rcx-select rcx-css-1te28na"
             name="attributes.0.values"
           >
@@ -77,17 +81,6 @@ exports[`RoomFormAttributeField renders Default without crashing 1`] = `
             </div>
           </div>
         </span>
-        <button
-          class="rcx-box rcx-box--full rcx-button rcx-css-1qsx7et"
-          title="Remove"
-          type="button"
-        >
-          <span
-            class="rcx-button--content"
-          >
-            Remove
-          </span>
-        </button>
       </div>
     </div>
   </div>
diff --git a/apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx b/apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx
index ae7b2062887a4..a4fdde032fb89 100644
--- a/apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx
+++ b/apps/meteor/client/views/admin/ABAC/AdminABACPage.tsx
@@ -76,22 +76,18 @@ const AdminABACPage = ({ shouldShowWarning }: AdminABACPageProps) => {
 					{tab === 'logs' && <LogsPage />}
 				</PageContent>
 			</Page>
-			{tab !== undefined && context !== undefined && (
+			{isABACAvailable === true && tab !== undefined && context !== undefined && (
 				<ContextualbarDialog onClose={() => handleCloseContextualbar()}>
 					{tab === 'room-attributes' && (
 						<>
-							{context === 'new' && isABACAvailable === true && <AttributesContextualBar onClose={() => handleCloseContextualbar()} />}
-							{context === 'edit' && _id && isABACAvailable === true && (
-								<AttributesContextualBarWithData id={_id} onClose={() => handleCloseContextualbar()} />
-							)}
+							{context === 'new' && <AttributesContextualBar onClose={() => handleCloseContextualbar()} />}
+							{context === 'edit' && _id && <AttributesContextualBarWithData id={_id} onClose={() => handleCloseContextualbar()} />}
 						</>
 					)}
 					{tab === 'rooms' && (
 						<>
-							{context === 'new' && isABACAvailable === true && <RoomsContextualBar onClose={() => handleCloseContextualbar()} />}
-							{context === 'edit' && _id && isABACAvailable === true && (
-								<RoomsContextualBarWithData id={_id} onClose={() => handleCloseContextualbar()} />
-							)}
+							{context === 'new' && <RoomsContextualBar onClose={() => handleCloseContextualbar()} />}
+							{context === 'edit' && _id && <RoomsContextualBarWithData id={_id} onClose={() => handleCloseContextualbar()} />}
 						</>
 					)}
 				</ContextualbarDialog>