diff --git a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php
index bf4881e0..7b1c8273 100644
--- a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php
+++ b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php
@@ -39,7 +39,6 @@ class CorporateMemberController extends Controller
         switch ($request->input('type')) {
             case 'employee-data':
                 $members = $this->corporateMemberService->getAllMemberEmployeeData($corporate_id, $request);
-                return response()->json($members);
                 return response()->json(Helper::paginateResources(DashboardMemberEmployeeDataResources::collection($members)));
             case 'claim-report':
                 $members = $this->corporateMemberService->getAllMemberClaimReports($corporate_id, $request);
diff --git a/app/Models/Member.php b/app/Models/Member.php
index f95595c2..1aed47fe 100644
--- a/app/Models/Member.php
+++ b/app/Models/Member.php
@@ -213,15 +213,25 @@ class Member extends Model
                 $arr[] = $this->person->name_prefix;
             }
 
-            $arr[] = $this->person->name ?? '-';
+            $arr[] = $this->person->name;
 
             if (!empty($this->person->name_suffix)) {
                 $arr[] = $this->person->name_suffix;
             }
+        } else {
+            if (!empty($this->name_prefix)) {
+                $arr[] = $this->name_prefix;
+            }
+
+            $arr[] = $this->name;
+
+            if (!empty($this->name_suffix)) {
+                $arr[] = $this->name_suffix;
+            }
         }
 
         return Attribute::make(
-            get: fn () => !empty($arr) ? ucwords(strtolower(implode(' ', $arr))) : null
+            get: fn () => $arr ? ucwords(strtolower(implode(' ', $arr))) : null
         );
     }
 
diff --git a/app/Services/CorporateMemberService.php b/app/Services/CorporateMemberService.php
index fbde85b3..25da5dc1 100644
--- a/app/Services/CorporateMemberService.php
+++ b/app/Services/CorporateMemberService.php
@@ -227,6 +227,8 @@ class CorporateMemberService
                 'id',
                 'person_id',
                 'member_id',
+                'name_prefix',
+                'name_suffix',
                 'name',
                 'members_effective_date',
                 'members_expire_date',