diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 0720ef6a..31549e40 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -26,26 +26,30 @@ class UserController extends Controller
             $medical_center_id = null;
         }
 
-        $Users = User::when( $request->has( 'name' ) && $request->name , function ( $query ) use ( $request ) {
-            $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
-        } )
-            ->when( ( $request->has( 'fromPicker' ) && $request->fromPicker ) || ( $request->has( 'upToPicker' ) && $request->upToPicker ) , function ( $query ) use ( $request ) {
-                $from = ( $request->fromPicker ) ? date( $request->fromPicker . ' 00:00:00' ) : date( '2010-01-01' . ' 00:00:00' );
-                $upTo = ( $request->upToPicker ) ? date( $request->upToPicker . ' 23:59:59' ) : date( 'Y-m-d' . ' 23:59:59' );
-                return $query->whereBetween( 'created_at' , [ $from , $upTo ] );
-            } )
-            ->when( $request->has( 'cell_number' ) && $request->cell_number , function ( $query ) use ( $request ) {
-                $query->where( 'cell_number' , 'LIKE' , '%' . $request->cell_number . '%' );
-            } )
-            ->when( $request->has( 'role' ) && $request->role , function ( $query ) use ( $request ) {
-                $query->role( $request->role );
-            } )
-            ->when( $medical_center_id , function ( $query ) use ( $medical_center_id ) {
-                $query->where( 'medical_center_id' , $medical_center_id );
-            } )
-            ->with( [ 'medical_center' , 'roles' ] )->paginate( 10 );
+        $Users = User::when($request->has('name') && $request->name, function ($query) use ($request) {
+            $query->where('name', 'LIKE', '%' . $request->name . '%');
+        })
+            ->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request) {
+                $from = ($request->fromPicker) ? date($request->fromPicker . ' 00:00:00') : date('2010-01-01' . ' 00:00:00');
+                $upTo = ($request->upToPicker) ? date($request->upToPicker . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
+                return $query->whereBetween('created_at', [$from, $upTo]);
+            })
+            ->when($request->has('cell_number') && $request->cell_number, function ($query) use ($request) {
+                $query->where('cell_number', 'LIKE', '%' . $request->cell_number . '%');
+            })
+            ->when($request->has('role') && $request->role, function ($query) use ($request) {
+                $query->role($request->role);
+            })
+            ->when($medical_center_id, function ($query) use ($medical_center_id) {
+                $query->where('medical_center_id', $medical_center_id);
+            })
+            ->whereDoesntHave('roles', function ($roleQuery) {
+                $roleQuery->where('name', 'Admin');
+            })
+            ->with(['medical_center', 'roles'])->paginate(10);
+
+        return MessageResponse::data($Users);
 
-        return MessageResponse::data( $Users );
     }
 
     public function store( StoreUserRequest $request )