diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 07243340..e42266d2 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -4832,8 +4832,9 @@ class ClientController extends AdminController
             $client_data = [
                 'client_type' => $postData['client_type'],
                 'client_name' => $postData['client_name'],
-                'email' => $postData['short_name'] ?? $postData['client_name'],
-                'phone' => $postData['mobile'],
+                'short_name' => $postData['short_name'] ?? $postData['client_name'],
+                'email' => $postData['email'] ?? null,
+                'phone' => $postData['mobile'] ?? null,
                 'client_code' => generate_client_code()
             ];
 
@@ -4844,6 +4845,8 @@ class ClientController extends AdminController
                 'client_type' => $postData['client_type'],
                 'client_name' => $postData['client_name'],
                 'short_name' => $postData['short_name'] ?? $postData['client_name'],
+                'email' => $postData['email'] ?? null,
+                'phone' => $postData['mobile'] ?? null,
                 'client_code' => generate_client_code(),
                 'entity_type_id' => 2
             ];
@@ -4958,8 +4961,9 @@ class ClientController extends AdminController
                 $client_data = [
                     'client_type' => $data['client_type'],
                     'client_name' => $data['client_name'],
-                    'email' => $data['short_name'] ?? $data['client_name'],
-                    'phone' => $data['mobile'],
+                    'short_name' => $postData['short_name'] ?? $data['client_name'],
+                    'email' => $data['email'] ?? null,
+                    'phone' => $data['mobile'] ?? null,
                     'client_code' => generate_client_code()
                 ];
 
@@ -4970,6 +4974,8 @@ class ClientController extends AdminController
                     'client_type' => $data['client_type'],
                     'client_name' => $data['client_name'],
                     'short_name' => $data['short_name'] ?? $data['client_name'],
+                    'email' => $data['email'] ?? null,
+                    'phone' => $data['mobile'] ?? null,
                     'client_code' => generate_client_code(),
                     'entity_type_id' => 2
                 ];