diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php
index 797af5a09..1fbf37bed 100644
--- a/app/Http/Controllers/ClientPortal/InvitationController.php
+++ b/app/Http/Controllers/ClientPortal/InvitationController.php
@@ -46,6 +46,21 @@ class InvitationController extends Controller
         return $this->genericRouter('recurring_invoice', $invitation_key);
     }
 
+    public function invoiceRouter(string $invitation_key)
+    {
+        return $this->genericRouter('invoice', $invitation_key);
+    }
+
+    public function quoteRouter(string $invitation_key)
+    {
+        return $this->genericRouter('quote', $invitation_key);
+    }
+
+    public function creditRouter(string $invitation_key)
+    {
+        return $this->genericRouter('credit', $invitation_key);
+    }
+
     private function genericRouter(string $entity, string $invitation_key)
     {
 
diff --git a/resources/views/portal/ninja2020/layout/error.blade.php b/resources/views/portal/ninja2020/layout/error.blade.php
index 920eb5933..b04dacd5b 100644
--- a/resources/views/portal/ninja2020/layout/error.blade.php
+++ b/resources/views/portal/ninja2020/layout/error.blade.php
@@ -15,7 +15,7 @@
                     @yield('code') — @yield('message')
                 </span>
 
-                <a class="button-link text-sm mt-2" href="{{ request()->getSchemeAndHttpHost() }}">
+                <a class="button-link text-sm mt-2" href="{{ url(request()->getSchemeAndHttpHost() . '/client') }}">
                     {{ ctrans('texts.back_to', ['url' => parse_url(request()->getHttpHost())['host'] ?? request()->getHttpHost()]) }}
                 </a>
             </div>
diff --git a/routes/client.php b/routes/client.php
index 12e530ffa..65590aa78 100644
--- a/routes/client.php
+++ b/routes/client.php
@@ -90,7 +90,9 @@ Route::get('client/subscriptions/{subscription}/purchase', 'ClientPortal\Subscri
 Route::group(['middleware' => ['invite_db'], 'prefix' => 'client', 'as' => 'client.'], function () {
     /*Invitation catches*/
     Route::get('recurring_invoice/{invitation_key}', 'ClientPortal\InvitationController@recurringRouter');
-    Route::get('{entity}/{invitation_key}', 'ClientPortal\InvitationController@router');
+    Route::get('invoice/{invitation_key}', 'ClientPortal\InvitationController@invoiceRouter');
+    Route::get('quote/{invitation_key}', 'ClientPortal\InvitationController@quoteRouter');
+    Route::get('credit/{invitation_key}', 'ClientPortal\InvitationController@creditRouter');
     Route::get('recurring_invoice/{invitation_key}/download_pdf', 'RecurringInvoiceController@downloadPdf')->name('recurring_invoice.download_invitation_key');
     Route::get('invoice/{invitation_key}/download_pdf', 'InvoiceController@downloadPdf')->name('invoice.download_invitation_key');
     Route::get('quote/{invitation_key}/download_pdf', 'QuoteController@downloadPdf')->name('quote.download_invitation_key');