diff --git a/app/PaymentDrivers/Mollie/CreditCard.php b/app/PaymentDrivers/Mollie/CreditCard.php
index 8a6af3dd2daf..1c96455d86ff 100644
--- a/app/PaymentDrivers/Mollie/CreditCard.php
+++ b/app/PaymentDrivers/Mollie/CreditCard.php
@@ -70,6 +70,12 @@ class CreditCard
                     'sequenceType' => 'recurring',
                     'description' => \sprintf('Hash: %s', $this->mollie->payment_hash->hash),
                     'webhookUrl'  => $this->mollie->company_gateway->webhookUrl(),
+                    'metadata' => [
+                        'client_id' => $this->mollie->client->hashed_id,
+                        'hash' => $this->mollie->payment_hash->hash,
+                        'gateway_type_id' => GatewayType::CREDIT_CARD,
+                        'payment_type_id' => PaymentType::CREDIT_CARD_OTHER,
+                    ],
                 ]);
 
                 if ($payment->status === 'paid') {
@@ -106,6 +112,12 @@ class CreditCard
                     'hash' => $this->mollie->payment_hash->hash,
                 ]),
                 'webhookUrl'  => $this->mollie->company_gateway->webhookUrl(),
+                'metadata' => [
+                        'client_id' => $this->mollie->client->hashed_id,
+                        'hash' => $this->mollie->payment_hash->hash,
+                        'gateway_type_id' => GatewayType::CREDIT_CARD,
+                        'payment_type_id' => PaymentType::CREDIT_CARD_OTHER,
+                    ],
                 'cardToken' => $request->gateway_response,
             ];
 
diff --git a/app/Providers/MailServiceProvider.php b/app/Providers/MailServiceProvider.php
index cc16f654f77e..0abea01a9dac 100644
--- a/app/Providers/MailServiceProvider.php
+++ b/app/Providers/MailServiceProvider.php
@@ -33,7 +33,7 @@ class MailServiceProvider extends MailProvider
 
     protected function registerIlluminateMailer()
     {
-
+        //this is not octane safe
         $this->app->singleton('mail.manager', function($app) {
             return new GmailTransportManager($app);
         });
diff --git a/app/Providers/NinjaTranslationServiceProvider.php b/app/Providers/NinjaTranslationServiceProvider.php
index 985987bc0288..7054f32514d0 100644
--- a/app/Providers/NinjaTranslationServiceProvider.php
+++ b/app/Providers/NinjaTranslationServiceProvider.php
@@ -33,6 +33,7 @@ class NinjaTranslationServiceProvider extends TranslationServiceProvider
          *
          */
 
+        //this is not octane safe
         $this->app->singleton('translator', function ($app) {
 
             $loader = $app['translation.loader'];
diff --git a/routes/web.php b/routes/web.php
index f29bf383ab55..67513dc9cc9c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -41,7 +41,7 @@ Route::group(['middleware' => ['url_db']], function () {
 Route::get('stripe/signup/{token}', 'StripeConnectController@initialize')->name('stripe_connect.initialization');
 Route::get('stripe/completed', 'StripeConnectController@completed')->name('stripe_connect.return');
 
-Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Checkout3dsController@index')->name('checkout.3ds_redirect');
-Route::get('mollie/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Mollie3dsController@index')->name('mollie.3ds_redirect');
-Route::get('gocardless/ibp_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\GoCardlessController@ibpRedirect')->name('gocardless.ibp_redirect');
+Route::get('checkout/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Checkout3dsController@index')->middleware('domain_db')->name('checkout.3ds_redirect');
+Route::get('mollie/3ds_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\Mollie3dsController@index')->middleware('domain_db')->name('mollie.3ds_redirect');
+Route::get('gocardless/ibp_redirect/{company_key}/{company_gateway_id}/{hash}', 'Gateways\GoCardlessController@ibpRedirect')->middleware('domain_db')->name('gocardless.ibp_redirect');
 Route::get('.well-known/apple-developer-merchantid-domain-association', 'ClientPortal\ApplePayDomainController@showAppleMerchantId');