diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.test.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.test.ts
index cb9c73d7b1..bf13859c41 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.test.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.test.ts
@@ -21,6 +21,14 @@ describe('normalizeEntityName', () => {
     expect(normalizeEntityName('User Name')).toBe('user_name');
   });
 
+  it('should normalize complex name to valid entity name', () => {
+    expect(normalizeEntityName('User (Name)')).toBe('user_name');
+  });
+
+  it('should normalize complex name to valid entity name without extra underscore', () => {
+    expect(normalizeEntityName('User :(Name:)')).toBe('user_name');
+  });
+
   it('should normalize e-mail to valid entity name', () => {
     expect(normalizeEntityName('user.name@example.com')).toBe(
       'user.name_example.com',
diff --git a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.ts b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.ts
index c1d2606018..41dbc1aed8 100644
--- a/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.ts
+++ b/plugins/catalog-backend-module-msgraph/src/microsoftGraph/helper.ts
@@ -15,8 +15,21 @@
  */
 
 export function normalizeEntityName(name: string): string {
-  return name
+  let cleaned = name
     .trim()
     .toLocaleLowerCase()
     .replace(/[^a-zA-Z0-9_\-\.]/g, '_');
+
+  // invalid to end with _
+  while (cleaned.endsWith('_')) {
+    cleaned = cleaned.substring(0, cleaned.length - 1);
+  }
+
+  // cleans up format for groups like 'my group (Reader)'
+  while (cleaned.includes('__')) {
+    // replaceAll from node.js >= 15
+    cleaned = cleaned.replace('__', '_');
+  }
+
+  return cleaned;
 }