diff --git a/app/PaymentDrivers/PayPalPPCPPaymentDriver.php b/app/PaymentDrivers/PayPalPPCPPaymentDriver.php
index e826b2121828..9d2dabc41324 100644
--- a/app/PaymentDrivers/PayPalPPCPPaymentDriver.php
+++ b/app/PaymentDrivers/PayPalPPCPPaymentDriver.php
@@ -142,9 +142,8 @@ class PayPalPPCPPaymentDriver extends BaseDriver
 
         $this->api_endpoint_url = $this->company_gateway->getConfigField('testMode') ? 'https://api-m.sandbox.paypal.com' : 'https://api-m.paypal.com';
         
-        $secret = $this->company_gateway->getConfigField('secret');
-        
-        $client_id = $this->company_gateway->getConfigField('clientId');
+        $secret = config('ninja.paypal.secret');
+        $client_id = config('ninja.paypal.client_id');
 
         if($this->access_token && $this->token_expiry && $this->token_expiry->isFuture())
             return $this;
@@ -154,6 +153,8 @@ class PayPalPPCPPaymentDriver extends BaseDriver
                                     ->withQueryParameters(['grant_type' => 'client_credentials'])
                                     ->post("{$this->api_endpoint_url}/v1/oauth2/token");
 
+        nlog($response->body());
+
         if($response->successful()) {
             $this->access_token = $response->json()['access_token'];
             $this->token_expiry = now()->addSeconds($response->json()['expires_in'] - 60);
@@ -200,7 +201,7 @@ class PayPalPPCPPaymentDriver extends BaseDriver
         $this->payment_hash->data = array_merge((array) $this->payment_hash->data, ['amount' => $data['total']['amount_with_fee']]);
         $this->payment_hash->save();
 
-        $data['client_id'] = $this->company_gateway->getConfigField('clientId');
+        $data['client_id'] = config('ninja.paypal.client_id');
         $data['token'] = $this->getClientToken();
         $data['order_id'] = $this->createOrder($data);
         $data['funding_source'] = $this->paypal_payment_method;
@@ -367,7 +368,7 @@ class PayPalPPCPPaymentDriver extends BaseDriver
             'Content-type' => 'application/json',
             'Accept-Language' => 'en_US',
             'PayPal-Partner-Attribution-Id' => 'invoiceninja_SP_PPCP',
-            'PayPal-Request-Id' => Str::uuid(),
+            'PayPal-Request-Id' => Str::uuid()->toString(),
         ], $headers);
     }
 
diff --git a/database/seeders/PaymentLibrariesSeeder.php b/database/seeders/PaymentLibrariesSeeder.php
index 355aa374e8ea..ef83fddaf205 100644
--- a/database/seeders/PaymentLibrariesSeeder.php
+++ b/database/seeders/PaymentLibrariesSeeder.php
@@ -84,7 +84,7 @@ class PaymentLibrariesSeeder extends Seeder
             ['id' => 58, 'name' => 'Razorpay', 'provider' => 'Razorpay', 'is_offsite' => false, 'sort_order' => 21, 'key' => 'hxd6gwg3ekb9tb3v9lptgx1mqyg69zu9', 'fields' => '{"apiKey":"","apiSecret":""}'],
             ['id' => 59, 'name' => 'Forte', 'provider' => 'Forte', 'is_offsite' => false, 'sort_order' => 21, 'key' => 'kivcvjexxvdiyqtj3mju5d6yhpeht2xs', 'fields' => '{"testMode":false,"apiLoginId":"","apiAccessId":"","secureKey":"","authOrganizationId":"","organizationId":"","locationId":""}'],
             ['id' => 60, 'name' => 'PayPal REST', 'provider' => 'PayPal_Rest', 'key' => '80af24a6a691230bbec33e930ab40665', 'fields' => '{"clientId":"","secret":"","signature":"","testMode":false}'],
-            ['id' => 61, 'name' => 'PayPal Platform', 'provider' => 'PayPal_PPCP', 'key' => '80af24a6a691230bbec33e930ab40666', 'fields' => '{"clientId":"","secret":"","signature":"","testMode":false}'],
+            ['id' => 61, 'name' => 'PayPal Platform', 'provider' => 'PayPal_PPCP', 'key' => '80af24a6a691230bbec33e930ab40666', 'fields' => '{"testMode":false}'],
         ];
 
         foreach ($gateways as $gateway) {
diff --git a/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php b/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
index 0234309e6a6b..1245d663ac7a 100644
--- a/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paypal/ppcp/pay.blade.php
@@ -37,7 +37,7 @@
 //&buyer-country=US&currency=USD&enable-funding=venmo
     const fundingSource = "{!! $funding_source !!}";
     const testMode = {{ $gateway->company_gateway->getConfigField('testMode') }};
-    const clientId = "{{ $gateway->company_gateway->getConfigField('clientId') }}";
+    const clientId = "{{ $client_id }}";
     const sandbox = { sandbox: clientId };
     const production = { production: clientId };
     const orderId = "{!! $order_id !!}";