diff --git a/app/Http/Controllers/ClientPortal/QuoteController.php b/app/Http/Controllers/ClientPortal/QuoteController.php
index 8e180cdebda8..e9b7649935d6 100644
--- a/app/Http/Controllers/ClientPortal/QuoteController.php
+++ b/app/Http/Controllers/ClientPortal/QuoteController.php
@@ -1,11 +1,22 @@
 <?php
 
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
 namespace App\Http\Controllers\ClientPortal;
 
 use App\Events\Quote\QuoteWasApproved;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\ClientPortal\ProcessQuotesInBulkRequest;
-use App\Http\Requests\ClientPortal\ShowQuoteRequest;
+use App\Http\Requests\ClientPortal\Quotes\ProcessQuotesInBulkRequest;
+use App\Http\Requests\ClientPortal\Quotes\ShowQuotesRequest;
+use App\Http\Requests\ClientPortal\Quotes\ShowQuoteRequest;
 use App\Jobs\Invoice\InjectSignature;
 use App\Models\Quote;
 use App\Utils\Ninja;
@@ -25,7 +36,7 @@ class QuoteController extends Controller
      *
      * @return Factory|View
      */
-    public function index()
+    public function index(ShowQuotesRequest $request)
     {
         return $this->render('quotes.index');
     }
diff --git a/app/Http/Requests/ClientPortal/ProcessQuotesInBulkRequest.php b/app/Http/Requests/ClientPortal/ProcessQuotesInBulkRequest.php
deleted file mode 100644
index f99e60880f73..000000000000
--- a/app/Http/Requests/ClientPortal/ProcessQuotesInBulkRequest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Requests\ClientPortal;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class ProcessQuotesInBulkRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'quotes' => ['array'],
-        ];
-    }
-}
diff --git a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
new file mode 100644
index 000000000000..bfa740e02ff5
--- /dev/null
+++ b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Requests\ClientPortal\Quotes;
+
+use App\Http\ViewComposers\PortalComposer;
+use Illuminate\Foundation\Http\FormRequest;
+use function auth;
+
+class ProcessQuotesInBulkRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
+    }
+
+    public function rules()
+    {
+        return [
+            'quotes' => ['array'],
+        ];
+    }
+}
diff --git a/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php b/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php
new file mode 100644
index 000000000000..1690a6c5c8b6
--- /dev/null
+++ b/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Requests\ClientPortal\Quotes;
+
+use App\Http\ViewComposers\PortalComposer;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ShowQuoteRequest extends FormRequest
+{
+    public function authorize()
+    {
+         return auth()->user()->client->id === $this->quote->client_id
+             && auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
+    }
+
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php b/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php
new file mode 100644
index 000000000000..6087131e07bd
--- /dev/null
+++ b/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
+
+namespace App\Http\Requests\ClientPortal\Quotes;
+
+use App\Http\ViewComposers\PortalComposer;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ShowQuotesRequest extends FormRequest
+{
+    public function authorize()
+    {
+        return auth('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES;
+    }
+
+    public function rules()
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Http/Requests/ClientPortal/ShowQuoteRequest.php b/app/Http/Requests/ClientPortal/ShowQuoteRequest.php
deleted file mode 100644
index 3e133fbe9c16..000000000000
--- a/app/Http/Requests/ClientPortal/ShowQuoteRequest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Requests\ClientPortal;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class ShowQuoteRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-
-        // return auth()->user()->client->id === $this->quote->client_id;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            //
-        ];
-    }
-}