diff --git a/app/Http/Controllers/StripeController.php b/app/Http/Controllers/StripeController.php
index be825544d402..1f4c901d4895 100644
--- a/app/Http/Controllers/StripeController.php
+++ b/app/Http/Controllers/StripeController.php
@@ -22,8 +22,8 @@ class StripeController extends BaseController
 	{
 		if(auth()->user()->isAdmin())
 		{
-
-			StripeUpdatePaymentMethods::dispatch(auth()->user()->getCompany());
+			
+			StripeUpdatePaymentMethods::dispatch(auth()->user()->company());
 
 			return response()->json(['message' => 'Processing'], 200);
 
@@ -39,7 +39,7 @@ class StripeController extends BaseController
 		if(auth()->user()->isAdmin())
 		{
 			
-			ImportStripeCustomers::dispatch(auth()->user()->getCompany());
+			ImportStripeCustomers::dispatch(auth()->user()->company());
 
 			return response()->json(['message' => 'Processing'], 200);
 
diff --git a/app/Models/User.php b/app/Models/User.php
index 9c785ea117b1..aabe8564d06d 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -169,15 +169,17 @@ class User extends Authenticatable implements MustVerifyEmail
      */
     public function getCompany()
     {
-        if ($this->company) {
-            return $this->company;
-        }
 
         if (request()->header('X-API-TOKEN')) {
             $company_token = CompanyToken::with(['company'])->whereRaw('BINARY `token`= ?', [request()->header('X-API-TOKEN')])->first();
 
             return $company_token->company;
         }
+        elseif ($this->company){
+
+            return $this->company;
+        
+        }
 
         // return false;
         throw new \Exception('No Company Found');
diff --git a/app/PaymentDrivers/Stripe/ImportCustomers.php b/app/PaymentDrivers/Stripe/ImportCustomers.php
index 641bd582a34d..0875dac36ec6 100644
--- a/app/PaymentDrivers/Stripe/ImportCustomers.php
+++ b/app/PaymentDrivers/Stripe/ImportCustomers.php
@@ -77,6 +77,7 @@ class ImportCustomers
 
         nlog("inserting a customer");
         nlog($customer);
+        
         $client = ClientFactory::create($this->stripe->company_gateway->company_id, $this->stripe->company_gateway->user_id);
 
         if(property_exists($customer, 'address'))