diff --git a/app/Http/Controllers/APIS/AdminApi/UsersController.php b/app/Http/Controllers/APIS/AdminApi/UsersController.php
index 6d93973..b951d5e 100644
--- a/app/Http/Controllers/APIS/AdminApi/UsersController.php
+++ b/app/Http/Controllers/APIS/AdminApi/UsersController.php
@@ -295,13 +295,14 @@ class UsersController extends Controller
             $activationLink = url("/apia/activate/{$userId}?token={$randomToken}");
 
             // Send activation email
-            Mail::to($user->email)->queue(new UserCreatedMail($user, $activationLink));
+            Mail::to($user->email)->send(new UserCreatedMail($user, $activationLink));
 
             return response()->json([
                 'success' => true,
                 'message' => 'User created successfully',
                 'data' => [
                     'user_id' => $userId,
+                    'token'=>$randomToken,
                     'activation_link' => $activationLink,
                     'external_service_response' => $serviceResponse
                 ]
@@ -661,7 +662,6 @@ class UsersController extends Controller
         $localResponse = null;
         $thingsboardResponse = null;
 
-        // ✅ Check in Local database
         $user = User::where('email', $email)->first();
 
         if ($user) {
@@ -688,6 +688,9 @@ class UsersController extends Controller
         ], 200);
     }
 
+
+
+
     public function userlistCustomer(Request $request)
     {
         try {
@@ -752,4 +755,4 @@ class UsersController extends Controller
             return jsonResponseWithErrorMessage($e->getMessage(), 500);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Services/AdminService.php b/app/Services/AdminService.php
index 68ea6b9..a6f2a16 100644
--- a/app/Services/AdminService.php
+++ b/app/Services/AdminService.php
@@ -233,15 +233,13 @@ class AdminService
             if (!isset($data['tenant_id'])) {
                 throw new \Exception('tenant_id is required');
             }
-            // static $counter = 1;
-            // $email = "dummy{$counter}@example.com";
-            // $counter++;
-
+            $randomNumber = rand(1000, 9999);
+            $email = "dummy{$randomNumber}@example.com";
 
             // Prepare the payload with required fields
             $payload = [
 
-                'email' => $data['email'] ?? '',
+                'email' => $email?? '',
                 'authority' => $data['authority'] ?? 'CUSTOMER_USER',
                 'firstName' => $data['first_name'] ?? '',
                 'lastName' => $data['last_name'] ?? '',