diff --git a/app/Http/Controllers/APIS/AdminApi/UsersController.php b/app/Http/Controllers/APIS/AdminApi/UsersController.php
index 131488f..a54c5cf 100644
--- a/app/Http/Controllers/APIS/AdminApi/UsersController.php
+++ b/app/Http/Controllers/APIS/AdminApi/UsersController.php
@@ -217,10 +217,10 @@ class UsersController extends Controller
                 // 'authority' => 'required|string|in:CUSTOMER_USER,TENANT_ADMIN,SYS_ADMIN',
                 // 'tenant_id' => 'required|uuid',
                 // 'customer_id' => 'nullable|uuid',
-                // 'first_name' => 'required|string|max:255',
-                // 'last_name' => 'required|string|max:255',
+                'first_name' => 'required|string|max:255',
+                'last_name' => 'required|string|max:255',
                 // 'phone' => 'nullable|string|max:20',
-                'name' => 'nullable|string|max:255',
+                // 'name' => 'nullable|string|max:255',
                 // 'description' => 'nullable|string',
                 // 'default_dashboard_id' => 'nullable',
                 // 'home_dashboard_id' => 'nullable',
@@ -247,10 +247,10 @@ class UsersController extends Controller
                 'authority' => $request->authority ?? 'CUSTOMER_USER',
                 'tenant_id' => $request->tenant_id ?? null,
                 'customer_id' => $request->customer_id ?? null,
-                'first_name' => $request->first_name ?? $request->name,
-                'last_name' => $request->last_name ?? $request->name,
+                'first_name' => $request->first_name ?? '',
+                'last_name' => $request->last_name ?? '',
                 'phone' => $request->phone ?? null,
-                'name' => $request->name ?? null,
+                'name' => $request->name ?? "{$request->first_name} {$request->last_name}",
                 'description' => $request->description ?? null,
                 'default_dashboard_id' => $request->default_dashboard_id ?? null,
                 'default_dashboard_fullscreen' => $request->default_dashboard_fullscreen ?? false,
@@ -267,13 +267,13 @@ class UsersController extends Controller
 
             $serviceData = [
                 'email' => $request->email,
-                'authority' => $request->authority,
+                'authority' => $request->authority ?? null,
                 'firstName' => $request->first_name,
                 'lastName' => $request->last_name,
                 'phone' => $request->phone,
                 'name' => $request->name ?? "{$request->first_name} {$request->last_name}",
                 'description' => $request->description,
-                'tenant_id' => $request->tenant_id,
+                'tenant_id' => 'bbab7c17-2f19-4eff-9ce7-63870e02b522',
                 'customer_id' => $request->customer_id
             ];
 
diff --git a/app/Services/AdminService.php b/app/Services/AdminService.php
index 7e6915d..8ec4a60 100644
--- a/app/Services/AdminService.php
+++ b/app/Services/AdminService.php
@@ -273,7 +273,7 @@ class AdminService
                 'name' => $data['name'] ?? ($data['first_name'] . ' ' . $data['last_name'] ?? ''),
                 'phone' => $data['phone'] ?? '',
                 'tenantId' => [
-                    'id' => $data['tenant_id'],
+                    'id' => 'bbab7c17-2f19-4eff-9ce7-63870e02b522',
                     'entityType' => 'TENANT'
                 ],
                 'additionalInfo' => [