diff --git a/include/api.tickets.php b/include/api.tickets.php
index 25cc9c4d1333f3a78b53e393ddd3afe9a86a6a38..f0758d5d2ea75324620ce12acbf30fe76222fb06 100644
--- a/include/api.tickets.php
+++ b/include/api.tickets.php
@@ -25,8 +25,15 @@ class TicketApiController extends ApiController {
                 $supported[] = $field->get('name');
         }
 
-        if(($form = TicketForm::lookup()->instanciate()))
-            foreach ($form->getDynamicFields() as $field)
+        # Ticket form fields
+        # TODO: Support userId for existing user
+        if(($form = TicketForm::getInstance()))
+            foreach ($form->getFields() as $field)
+                $supported[] = $field->get('name');
+
+        # User form fields
+        if(($form = UserForm::getInstance()))
+            foreach ($form->getFields() as $field)
                 $supported[] = $field->get('name');
 
         if(!strcasecmp($format, 'email')) {