diff --git a/src/app/pages/credentials/users/user-form/user-form.component.html b/src/app/pages/credentials/users/user-form/user-form.component.html
index 29c0a34bfb9..d96261a03f3 100644
--- a/src/app/pages/credentials/users/user-form/user-form.component.html
+++ b/src/app/pages/credentials/users/user-form/user-form.component.html
@@ -81,7 +81,7 @@
           [label]="'Auxiliary Groups' | translate"
           [tooltip]="tooltips.groups | translate"
           [resolveValue]="true"
-          [resolveOptions]="localGroupOptions$"
+          [resolveOptions]="groupOptions$"
           [autocompleteProvider]="autocompleteProvider"
         ></ix-chips>
 
diff --git a/src/app/pages/credentials/users/user-form/user-form.component.ts b/src/app/pages/credentials/users/user-form/user-form.component.ts
index 974cf9eb495..2366477387c 100644
--- a/src/app/pages/credentials/users/user-form/user-form.component.ts
+++ b/src/app/pages/credentials/users/user-form/user-form.component.ts
@@ -169,20 +169,16 @@ export class UserFormComponent implements OnInit {
     smbBuiltin: helptextUsers.smbBuiltin,
   };
 
-  readonly localGroupOptions$ = this.api.call('group.query', [[['local', '=', true]]]).pipe(
+  readonly groupOptions$ = this.api.call('group.query', [[['local', '=', true]]]).pipe(
     map((groups) => groups.map((group) => ({ label: group.group, value: group.id }))),
   );
 
   shellOptions$: Observable<Option[]>;
   readonly treeNodeProvider = this.filesystemService.getFilesystemNodeProvider({ directoriesOnly: true });
-  readonly groupProvider = new SimpleAsyncComboboxProvider(
-    this.api.call('group.query').pipe(
-      map((groups) => groups.map((group) => ({ label: group.group, value: group.id }))),
-    ),
-  );
+  readonly groupProvider = new SimpleAsyncComboboxProvider(this.groupOptions$);
 
   autocompleteProvider: ChipsProvider = (query: string) => {
-    return this.api.call('group.query', [[['name', '^', query]]]).pipe(
+    return this.api.call('group.query', [[['name', '^', query], ['local', '=', true]]]).pipe(
       map((groups) => groups.map((group) => group.group)),
     );
   };