diff --git a/src/components/attribute-form/AttributeForm.tsx b/src/components/attribute-form/AttributeForm.tsx
index ac421cda5d..cece8b1d93 100644
--- a/src/components/attribute-form/AttributeForm.tsx
+++ b/src/components/attribute-form/AttributeForm.tsx
@@ -177,11 +177,7 @@ export const AttributesForm = ({
           </Tbody>
         </TableComposable>
         <ActionGroup className="kc-attributes__action-group">
-          <Button
-            variant="primary"
-            type="submit"
-            isDisabled={!formState.isDirty}
-          >
+          <Button variant="primary" type="submit" isDisabled={!watchLast}>
             {t("common:save")}
           </Button>
           <Button
diff --git a/src/groups/GroupTable.tsx b/src/groups/GroupTable.tsx
index f95e6250c9..6cd1a55283 100644
--- a/src/groups/GroupTable.tsx
+++ b/src/groups/GroupTable.tsx
@@ -47,7 +47,9 @@ export const GroupTable = () => {
   const loader = async () => {
     const groupsData = id
       ? (await adminClient.groups.findOne({ id })).subGroups
-      : await adminClient.groups.find();
+      : await adminClient.groups.find({
+          briefRepresentation: false,
+        } as unknown as any);
 
     if (!groupsData) {
       history.push(`/${realm}/groups`);