diff --git a/app/Http/Controllers/APIS/AdminApi/CustomerController.php b/app/Http/Controllers/APIS/AdminApi/CustomerController.php
index ad8be4e..d98ce5a 100644
--- a/app/Http/Controllers/APIS/AdminApi/CustomerController.php
+++ b/app/Http/Controllers/APIS/AdminApi/CustomerController.php
@@ -32,13 +32,12 @@ class CustomerController extends Controller
 
             $customerEmailExist = Customer::where('email', $request->email)->first();
             if ($customerEmailExist) {
-                // return jsonResponseWithErrorMessage('Email already exists', 400);
-                return response()->json(['status' => 'error','message' => 'Email already exists'],400);
+                return jsonResponseWithErrorMessage('Email already exists', 400);
             }
 
             $customerNameExist = Customer::where('title', $request->title)->first();
             if ($customerNameExist) {
-                return response()->json(['status' => 'error','message' => 'Email already exists'],400);
+                return jsonResponseWithErrorMessage('Name already exists', 400);
             }
 
             $userData = [
diff --git a/app/Http/Controllers/APIS/AdminApi/DeviceController.php b/app/Http/Controllers/APIS/AdminApi/DeviceController.php
index 8dcaf64..b36631d 100644
--- a/app/Http/Controllers/APIS/AdminApi/DeviceController.php
+++ b/app/Http/Controllers/APIS/AdminApi/DeviceController.php
@@ -32,7 +32,7 @@ class DeviceController extends Controller
 
             $deviceNameExists = Device::where('name', $request->name)->first();
             if (empty($request->id) && $deviceNameExists) {
-                return response()->json(['status' => 'error','message' => 'Device name already exists'],400);
+                return jsonResponseWithErrorMessage('Device name already exists', 400);
             }
 
             $deviceData = [
@@ -67,7 +67,7 @@ class DeviceController extends Controller
 
                 $deviceNameExists = Device::where('name', $request->name)->where('id','!=',$request->id)->first();
                 if ($deviceNameExists) {
-                    return response()->json(['status' => 'error','message' => 'Device name already exists'],400);
+                    return jsonResponseWithErrorMessage('Device name already exists', 400);
                 }
             }
             if (!empty($request->firmwareId)) {
diff --git a/app/Http/Controllers/APIS/AdminApi/UsersController.php b/app/Http/Controllers/APIS/AdminApi/UsersController.php
index 3c4fbec..7f06c4a 100644
--- a/app/Http/Controllers/APIS/AdminApi/UsersController.php
+++ b/app/Http/Controllers/APIS/AdminApi/UsersController.php
@@ -216,7 +216,7 @@ class UsersController extends Controller
 
             $userEmailExist = User::where('email', $request->email)->first();
             if ($userEmailExist) {
-                return response()->json(['status' => 'error','message' => 'Email already exists'],400);
+                return jsonResponseWithErrorMessage('Email already exists', 400);
             }
 
             // Generate UUID for the user