diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index c66c775947c8..37786b401b53 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -184,7 +184,7 @@ class ClientController extends BaseController
         $data = [
             'client' => $client,
             'method' => 'PUT',
-            'url' => 'clients/'.$publicId,
+            'url' => 'clients/'.$client->public_id,
             'title' => trans('texts.edit_client'),
         ];
 
diff --git a/app/Http/Requests/BaseRequest.php b/app/Http/Requests/BaseRequest.php
index f7be7a8de3cb..eb97a949a8f3 100644
--- a/app/Http/Requests/BaseRequest.php
+++ b/app/Http/Requests/BaseRequest.php
@@ -15,8 +15,8 @@ class BaseRequest extends Request {
             return $this->entity;
         }
         
-        //dd($this->clients);
-        $publicId = Input::get('public_id') ?: Input::get('id');
+        $paramName = $this->entityType . 's';
+        $publicId = $this->$paramName ?: (Input::get('public_id') ?: Input::get('id'));
         
         if ( ! $publicId) {
             return null;