diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index d6d1601d405..c46b554388d 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -123,11 +123,11 @@ class Stripe extends CommonObject
 	}
 
 
-	/**
-	 * customerStripe
+/**
+	 * customerStripe Call customer in stripe && create/update and save it on dolibarr
 	 *
-	 * @param int	 $id		???
-	 * @param string $key		???
+	 * @param	int		$id		Id of third party
+	 * @return	string				Stripe account ref 'acc_xxxxxxxxxxxxx'
 	 * @return \Stripe\StripeObject|\Stripe\ApiResource
 	 */
 	public function customerStripe($id,$key)
@@ -142,10 +142,11 @@ class Stripe extends CommonObject
 				$mode = $conf->global->STRIPE_LIVE;
 			}
 		}
-		$sql = "SELECT rowid,fk_soc,fk_key,mode,entity";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "societe_stripe";
-		$sql .= " WHERE fk_soc = " . $id . " ";
-		$sql .= " AND  mode=" . $mode . " AND entity IN (" . getEntity('stripe') . ")";
+		$sql = "SELECT sa.key_account as key_account, sa.entity";
+		$sql.= " FROM " . MAIN_DB_PREFIX . "societe_account as sa";
+		$sql.= " WHERE sa.fk_soc = " . $id;
+		$sql.= " AND sa.entity IN (".getEntity('societe').")";
+		$sql.= " AND sa.site = 'stripe' AND sa.status = 0".((int) $status);
 
 		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -155,7 +156,7 @@ class Stripe extends CommonObject
 			$num = $this->db->num_rows($resql);
 			if ($num) {
 				$obj = $this->db->fetch_object($resql);
-				$tiers = $obj->fk_key;
+				$tiers = $obj->key_account;
 				if ($conf->entity == 1) {
 					$customer = \Stripe\Customer::retrieve("$tiers");
 				} else {
@@ -178,8 +179,8 @@ class Stripe extends CommonObject
 					));
 				}
 				$customer_id = "" . $customer->id . "";
-				$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_stripe (fk_soc,fk_key,mode,entity)";
-				$sql .= " VALUES ($id,'$customer_id'," . $mode . "," . $conf->entity . ")";
+				$sql = "INSERT INTO " . MAIN_DB_PREFIX . "societe_account (fk_soc,key_account,site,status,entity)";
+				$sql .= " VALUES ($id,'$customer_id','stripe'," . $mode . "," . $conf->entity . ")";
 				dol_syslog(get_class($this) . "::create sql=" . $sql, LOG_DEBUG);
 				$resql = $this->db->query($sql);
 			}