diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php
index 14fd2936..6803eec9 100644
--- a/app/Http/Resources/BookingResource.php
+++ b/app/Http/Resources/BookingResource.php
@@ -25,7 +25,7 @@ class BookingResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'company' => new CompanyResource($this->company, $this->userInfo),
+            'company' => new CompanyResource($this->company),
             'bank' => new BankResource($this->bank),
             'service' => new ServiceTypeResource($this->service),
             'marking' => $this->marking,
diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php
index 59eb3cee..eff2bd1b 100644
--- a/app/Http/Resources/CompanyResource.php
+++ b/app/Http/Resources/CompanyResource.php
@@ -18,14 +18,6 @@ use Illuminate\Support\Facades\Auth;
 
 class CompanyResource extends JsonResource
 {
-    private $userInfo;
-
-    public function __construct($resource, $userInfo = null)
-    {
-        parent::__construct($resource);
-        $this->userInfo = $userInfo;
-    }
-
     /**
      * Transform the resource into an array.
      *
@@ -40,22 +32,6 @@ class CompanyResource extends JsonResource
         $segment = SegmentConstant::where('reference', SegmentConstants::SUPPLIER_CURRENCIES)->where('detail->id', $this->id)->first();
         $serviceCharge = SegmentConstant::where('reference', SegmentConstants::SERVICE_CHARGE)->where('detail->id', $this->id)->first();
 
-        $userResource = null;
-
-        $userInfoEmail = $this->userInfo && isset($this->userInfo->email) ? $this->userInfo->email : null;
-        $userInfoType = $this->userInfo && isset($this->userInfo->type) ? $this->userInfo->type : null;
-
-        if(!$userInfoEmail && Auth::user()){
-            $userInfoEmail = Auth::user()->email;
-        }
-        if(!$userInfoType && Auth::user()){
-            $userInfoType = Auth::user()->type;
-        }
-
-        if(!is_null($userInfoEmail) && !is_null($userInfoType)){
-            $userResource = new UserResource($userInfoType === RoleTypes::USER ? $this->employees()->where('email', '=',  $userInfoEmail)->first() : $this->employees()->orderBy('id', 'DESC')->first());
-        }
-
         return [
             'id' => $this->id,
             'name' => $this->name,
@@ -66,8 +42,7 @@ class CompanyResource extends JsonResource
             'status' => (int) $this->status,
             'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())),
             'address' => new AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())),
-            //cief todo: this one need to decide what to do to replace Auth:user() when it is run by job queue
-            'employee' =>  $userResource,
+            'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()),
             'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->first()),
             'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []),
             'confirmed_bookings' => $this->bookings()->whereHas('transactions', function ($query){
diff --git a/app/Http/Resources/DocumentResource.php b/app/Http/Resources/DocumentResource.php
index 075e27f3..c0f801bb 100644
--- a/app/Http/Resources/DocumentResource.php
+++ b/app/Http/Resources/DocumentResource.php
@@ -5,9 +5,6 @@ namespace App\Http\Resources;
 use App\Models\Booking;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 
 class DocumentResource extends JsonResource
 {
@@ -24,7 +21,7 @@ class DocumentResource extends JsonResource
             'reference' => $this->reference,
             'status' => (int) $this->status,
             'document_type' => $this->document_type,
-            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingResource($this->owner, $this->userInfo) : new CompanyResource($this->owner, $this->userInfo)) : null,
+            'owner' => $this->relationLoaded('owner') ? ($this->owner instanceof Booking ? new BookingResource($this->owner) : new CompanyResource($this->owner)) : null,
             'files' => FileResource::collection($this->files),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A')
         ];