diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 37786b401b53..ee400287b4f1 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -95,12 +95,9 @@ class ClientController extends BaseController
      * @param  int      $id
      * @return Response
      */
-    public function show($publicId)
+    public function show(ClientRequest $request)
     {
-        //$client = $request->entity()->load('conacts');         
-        $client = Client::withTrashed()->scope($publicId)->with('contacts', 'size', 'industry')->firstOrFail();
-        
-        $this->authorize('view', $client);
+        $client = $request->entity();         
         
         $user = Auth::user();
         Utils::trackViewed($client->getDisplayName(), ENTITY_CLIENT);
diff --git a/app/Http/Requests/ClientRequest.php b/app/Http/Requests/ClientRequest.php
index e6470c6bd621..9d8e51556c9e 100644
--- a/app/Http/Requests/ClientRequest.php
+++ b/app/Http/Requests/ClientRequest.php
@@ -11,7 +11,7 @@ class ClientRequest extends BaseRequest {
 
     public function authorize()
     {
-        return true;
+        return $this->user()->can('view', $this->entity());
     }
 
     /**