diff --git a/app/Http/Controllers/ClientPortalController.php b/app/Http/Controllers/ClientPortalController.php
index 493ae23c5f0c..7ab5256cb349 100644
--- a/app/Http/Controllers/ClientPortalController.php
+++ b/app/Http/Controllers/ClientPortalController.php
@@ -107,8 +107,6 @@ class ClientPortalController extends BaseController
             }
         }
 
-        $paymentDriver = $account->paymentDriver($invitation, GATEWAY_TYPE_CREDIT_CARD);
-
         if ($wepayGateway = $account->getGatewayConfig(GATEWAY_WEPAY)){
             $data['enableWePayACH'] = $wepayGateway->getAchEnabled();
         }
@@ -132,12 +130,19 @@ class ClientPortalController extends BaseController
             'contact' => $contact,
             'paymentTypes' => $paymentTypes,
             'paymentURL' => $paymentURL,
-            'transactionToken' => $paymentDriver->createTransactionToken(),
-            'partialView' => $paymentDriver->partialView(),
-            'accountGateway' => $paymentDriver->accountGateway,
             'phantomjs' => Input::has('phantomjs'),
         );
 
+        if ($paymentDriver = $account->paymentDriver($invitation, GATEWAY_TYPE_CREDIT_CARD)) {
+            $data += [
+                'transactionToken' => $paymentDriver->createTransactionToken(),
+                'partialView' => $paymentDriver->partialView(),
+                'accountGateway' => $paymentDriver->accountGateway,                
+            ];
+        }
+
+
+
         if($account->hasFeature(FEATURE_DOCUMENTS) && $this->canCreateZip()){
             $zipDocs = $this->getInvoiceZipDocuments($invoice, $size);
 
@@ -740,7 +745,7 @@ class ClientPortalController extends BaseController
 
         return redirect()->to($client->account->enable_client_portal?'/client/dashboard':'/client/payment_methods/');
     }
-    
+
     public function setDefaultPaymentMethod(){
         if (!$contact = $this->getContact()) {
             return $this->returnError();
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index cb8a40b64510..72aff941cf50 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -22,7 +22,7 @@
             }
 		</style>
 
-    @if ($accountGateway->gateway_id == GATEWAY_BRAINTREE && !empty($transactionToken))
+    @if (!empty($transactionToken) && $accountGateway->gateway_id == GATEWAY_BRAINTREE)
         <div id="paypal-container"></div>
         <script type="text/javascript" src="https://js.braintreegateway.com/js/braintree-2.23.0.min.js"></script>
         <script type="text/javascript" >
@@ -97,7 +97,7 @@
 
 	<div class="container">
 
-        @if ($partialView)
+        @if (!empty($partialView))
             @include($partialView)
         @else
             <div class="pull-right" style="text-align:right">