diff --git a/app/plugins/CoreAssigner/templates/FormatAssigners/fields.inc b/app/plugins/CoreAssigner/templates/FormatAssigners/fields.inc
index f382bc570..b6d06487a 100644
--- a/app/plugins/CoreAssigner/templates/FormatAssigners/fields.inc
+++ b/app/plugins/CoreAssigner/templates/FormatAssigners/fields.inc
@@ -47,18 +47,30 @@
 <?php
 // This view does currently not support read-only, and add is not used
 if($vv_action == 'edit') {
-  print $this->Field->control('format');
-  
-  print $this->Field->control(
-    fieldName: 'collision_mode',
-    options: [
-      'onChange' => 'updateGadgets()'
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'format'
     ]
-  );
-
-  print $this->Field->control('permitted_characters');
+  ]);
 
-  print $this->Field->control('minimum');
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'collision_mode',
+      'options'   => [
+        'onChange' => 'updateGadgets()'
+      ]
+    ]
+  ]);
 
-  print $this->Field->control('maximum');
+  foreach([
+            'permitted_characters',
+            'minimum',
+            'maximum',
+          ] as $field) {
+    print $this->element('form/listItem', [
+      'arguments' => [
+        'fieldName' => $field,
+      ]
+    ]);
+  }
 }
diff --git a/app/plugins/CoreAssigner/templates/SqlAssigners/fields.inc b/app/plugins/CoreAssigner/templates/SqlAssigners/fields.inc
index d0b2f5942..d2ede3a3d 100644
--- a/app/plugins/CoreAssigner/templates/SqlAssigners/fields.inc
+++ b/app/plugins/CoreAssigner/templates/SqlAssigners/fields.inc
@@ -27,9 +27,15 @@
 
 // This view does currently not support read-only, and add is not used
 if($vv_action == 'edit') {
-  print $this->Field->control('server_id');
-  
-  print $this->Field->control('source_table');
-
-  print $this->Field->control('type_id');
+  foreach([
+            'server_id',
+            'source_table',
+            'type_id',
+          ] as $field) {
+    print $this->element('form/listItem', [
+      'arguments' => [
+        'fieldName' => $field,
+      ]
+    ]);
+  }
 }
diff --git a/app/plugins/CoreServer/templates/SqlServers/fields.inc b/app/plugins/CoreServer/templates/SqlServers/fields.inc
index 0d0a13d04..a15d291f9 100644
--- a/app/plugins/CoreServer/templates/SqlServers/fields.inc
+++ b/app/plugins/CoreServer/templates/SqlServers/fields.inc
@@ -27,15 +27,18 @@
 
 // This view does currently not support read-only, and add is not used
 if($vv_action == 'edit') {
-  print $this->Field->control('type');
-  
-  print $this->Field->control('hostname');
-
-  print $this->Field->control('port');
-
-  print $this->Field->control('databas');
-
-  print $this->Field->control('username');
-
-  print $this->Field->control('password');
+  foreach([
+            'type',
+            'hostname',
+            'port',
+            'databas',
+            'username',
+            'password',
+          ] as $field) {
+    print $this->element('form/listItem', [
+      'arguments' => [
+        'fieldName' => $field,
+      ]
+    ]);
+  }
 }