diff --git a/projects/fusio-sdk/package.json b/projects/fusio-sdk/package.json
index 348c67d..c06f535 100644
--- a/projects/fusio-sdk/package.json
+++ b/projects/fusio-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-fusio-sdk",
-  "version": "6.1.4",
+  "version": "6.1.5",
   "description": "SDK to integrate Fusio into an Angular app",
   "keywords": [
     "Fusio",
diff --git a/projects/fusio-sdk/src/lib/component/form/list/form-list.component.html b/projects/fusio-sdk/src/lib/component/form/list/form-list.component.html
index 0599ae6..3875d99 100644
--- a/projects/fusio-sdk/src/lib/component/form/list/form-list.component.html
+++ b/projects/fusio-sdk/src/lib/component/form/list/form-list.component.html
@@ -8,7 +8,7 @@
       </div>
     </ng-container>
     <ng-container *ngIf="type === 'autocomplete' && service">
-      <fusio-form-autocomplete id="{{name}}-{{i}}" name="{{name}}-{{i}}" [service]="service" [useTilde]="useTilde" [data]="property.value" (dataChange)="doChange(i, $event)" [disabled]="disabled">
+      <fusio-form-autocomplete id="{{name}}-{{i}}" name="{{name}}-{{i}}" [service]="service" [data]="property.value" (dataChange)="doChange(i, $event)" [useId]="useId" [useTilde]="useTilde" [disabled]="disabled">
         <button class="btn btn-danger" type="button" (click)="doRemove(i)"><i class="bi bi-x"></i></button>
       </fusio-form-autocomplete>
     </ng-container>
@@ -23,7 +23,7 @@
       </div>
     </ng-container>
     <ng-container *ngIf="type === 'autocomplete' && service">
-      <fusio-form-autocomplete id="{{name}}-newValue" name="{{name}}-newValue" [service]="service" [useTilde]="useTilde" [data]="newValue" (dataChange)="newValue = $event; doAdd()" (enter)="doAdd()" [disabled]="disabled">
+      <fusio-form-autocomplete id="{{name}}-newValue" name="{{name}}-newValue" [service]="service" [data]="newValue" (dataChange)="newValue = $event; doAdd()" (enter)="doAdd()" [useId]="useId" [useTilde]="useTilde" [disabled]="disabled">
         <button class="btn btn-success" type="button" (click)="doAdd()"><i class="bi bi-plus"></i></button>
       </fusio-form-autocomplete>
     </ng-container>
diff --git a/projects/fusio-sdk/src/lib/component/form/list/form-list.component.ts b/projects/fusio-sdk/src/lib/component/form/list/form-list.component.ts
index 345e21d..a168323 100644
--- a/projects/fusio-sdk/src/lib/component/form/list/form-list.component.ts
+++ b/projects/fusio-sdk/src/lib/component/form/list/form-list.component.ts
@@ -14,6 +14,7 @@ export class FormListComponent implements OnInit {
   @Input() data: Array<string> = [];
   @Input() service?: Service<any>;
   @Input() useTilde: boolean = false;
+  @Input() useId: boolean = false;
   @Output() dataChange = new EventEmitter<Array<string>>();
 
   local: Array<any> = [];
diff --git a/projects/fusio-sdk/src/lib/component/form/map/form-map.component.html b/projects/fusio-sdk/src/lib/component/form/map/form-map.component.html
index ebbd880..902c526 100644
--- a/projects/fusio-sdk/src/lib/component/form/map/form-map.component.html
+++ b/projects/fusio-sdk/src/lib/component/form/map/form-map.component.html
@@ -4,11 +4,11 @@
   <div class="col-sm-10">
     <ng-container *ngIf="type !== 'autocomplete'">
       <div class="input-group">
-        <input type="{{type}}" id="{{name}}-{{property.key}}" name="{{name}}-{{property.key}}" [ngModel]="property.value" (ngModelChange)="doChange(i, $event)" class="form-control">
+        <input type="{{type}}" id="{{name}}-{{property.key}}" name="{{name}}-{{property.key}}" [ngModel]="property.value" (ngModelChange)="doChange(i, $event)" [disabled]="disabled" class="form-control">
       </div>
     </ng-container>
     <ng-container *ngIf="type === 'autocomplete' && service">
-      <fusio-form-autocomplete id="{{name}}-{{property.key}}" name="{{name}}-{{property.key}}" [service]="service" [useTilde]="useTilde" [data]="property.value" (dataChange)="doChange(i, $event)">
+      <fusio-form-autocomplete id="{{name}}-{{property.key}}" name="{{name}}-{{property.key}}" [service]="service" [data]="property.value" (dataChange)="doChange(i, $event)" [useId]="useId" [useTilde]="useTilde" [disabled]="disabled">
         <button class="btn btn-danger" type="button" (click)="doRemove(i)"><i class="bi bi-x"></i></button>
       </fusio-form-autocomplete>
     </ng-container>
@@ -26,7 +26,7 @@
       </div>
     </ng-container>
     <ng-container *ngIf="type === 'autocomplete' && service">
-      <fusio-form-autocomplete id="{{name}}-newValue" name="{{name}}-newValue" [service]="service" [useTilde]="useTilde" [data]="newValue" (dataChange)="newValue = $event" (enter)="doAdd()" [disabled]="disabled">
+      <fusio-form-autocomplete id="{{name}}-newValue" name="{{name}}-newValue" [service]="service" [data]="newValue" (dataChange)="newValue = $event" (enter)="doAdd()" [useId]="useId" [useTilde]="useTilde" [disabled]="disabled">
         <button class="btn btn-success" type="button" (click)="doAdd()"><i class="bi bi-plus"></i></button>
       </fusio-form-autocomplete>
     </ng-container>
diff --git a/projects/fusio-sdk/src/lib/component/form/map/form-map.component.ts b/projects/fusio-sdk/src/lib/component/form/map/form-map.component.ts
index 40a9f27..e6786a1 100644
--- a/projects/fusio-sdk/src/lib/component/form/map/form-map.component.ts
+++ b/projects/fusio-sdk/src/lib/component/form/map/form-map.component.ts
@@ -14,6 +14,7 @@ export class FormMapComponent implements OnInit {
   @Input() data: Record<string, string> = {};
   @Input() service?: Service<any>;
   @Input() useTilde: boolean = false;
+  @Input() useId: boolean = false;
   @Output() dataChange = new EventEmitter<Record<string, string>>();
 
   local: Array<Entry> = [];