diff --git a/geant_service_orchestrator/workflows/device/create_device.py b/geant_service_orchestrator/workflows/device/create_device.py
index 0e76bafc81ae7b367d73f23cd1aac15c99972c0f..37ddb65208034123798b4b93014c70ca441d30fb 100644
--- a/geant_service_orchestrator/workflows/device/create_device.py
+++ b/geant_service_orchestrator/workflows/device/create_device.py
@@ -11,20 +11,22 @@ from orchestrator.workflow import done, init, step, workflow
 from orchestrator.workflows.steps import resync, set_status
 from orchestrator.workflows.steps import store_process_subscription
 from orchestrator.workflows.utils import wrap_create_initial_input_form
-
 from products.product_types.device import DeviceInactive, DeviceProvisioning
+from products.product_types.device import DeviceVendor
+import ipaddress
 
 
 def initial_input_form_generator(product_name: str) -> FormGenerator:
-    class CreateUserForm(FormPage):
+    class CreateDeviceForm(FormPage):
         class Config:
             title = product_name
 
         fqdn: str
-        ts_address: str
+        ts_address: ipaddress.IPv4Address
         ts_port: int
+        device_vendor: DeviceVendor
 
-    user_input = yield CreateUserForm
+    user_input = yield CreateDeviceForm
 
     return user_input.dict()