diff --git a/src/include/class-wc-retailcrm-customers.php b/src/include/class-wc-retailcrm-customers.php
index f1adb1c..a7a180b 100644
--- a/src/include/class-wc-retailcrm-customers.php
+++ b/src/include/class-wc-retailcrm-customers.php
@@ -172,8 +172,8 @@ if (!class_exists('WC_Retailcrm_Customers')) :
          */
         public function searchCustomer($filter)
         {
-            if (isset($filter['id'])) {
-                $search = $this->retailcrm->customersGet($filter['id']);
+            if (isset($filter['externalId'])) {
+                $search = $this->retailcrm->customersGet($filter['externalId']);
             } elseif (isset($filter['email'])) {
                 $search = $this->retailcrm->customersList(array('email' => $filter['email']));
             }
diff --git a/src/include/class-wc-retailcrm-orders.php b/src/include/class-wc-retailcrm-orders.php
index 44f5daf..992a44d 100644
--- a/src/include/class-wc-retailcrm-orders.php
+++ b/src/include/class-wc-retailcrm-orders.php
@@ -125,38 +125,45 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
                 return null;
             }
 
-            $order = wc_get_order($order_id);
-            $this->processOrder($order);
-            $customer = $order->get_user();
+            $wcOrder = wc_get_order($order_id);
+            $this->processOrder($wcOrder);
+            $wpUser = $wcOrder->get_user();
 
-            if ($customer != false) {
-                $search = $this->customers->searchCustomer(array('id' => $customer->get('ID')));
+            if ($wpUser instanceof WP_User) {
+                $wpUserId = (int)$wpUser->get('ID');
+                $foundCustomer = $this->customers->searchCustomer(array(
+                    'externalId' => $wpUserId
+                ));
 
-                if (!$search) {
-                    $this->customers->createCustomer($customer);
-                } else {
-                    $this->order['customer']['externalId'] = $search['externalId'];
-                }
-            } else {
-                $search = $this->customers->searchCustomer(array('email' => $order->get_billing_email()));
+                if (empty($foundCustomer)) {
+                    $customerId = $this->customers->createCustomer($wpUserId);
 
-                if (!$search) {
-                    $new_customer = $this->customers->buildCustomerFromOrderData($order);
-                    $id = $this->customers->createCustomer($new_customer);
-
-                    if ($id !== null) {
-                        $this->order['customer']['id'] = $id;
+                    if (!empty($customerId)) {
+                        $this->order['customer']['id'] = $customerId;
                     }
                 } else {
-                    $this->order['customer']['externalId'] = $search['externalId'];
+                    $this->order['customer']['externalId'] = $foundCustomer['externalId'];
                 }
+            } else {
+                $foundCustomer = $this->customers->searchCustomer(array(
+                    'email' => $wcOrder->get_billing_email()
+                ));
 
-                unset($new_customer);
+                if (empty($foundCustomer)) {
+                    $wcCustomer = $this->customers->buildCustomerFromOrderData($wcOrder);
+                    $customerId = $this->customers->createCustomer($wcCustomer);
+
+                    if (!empty($customerId)) {
+                        $this->order['customer']['id'] = $customerId;
+                    }
+                } else {
+                    $this->order['customer']['externalId'] = $foundCustomer['externalId'];
+                }
             }
 
             $this->retailcrm->ordersCreate($this->order);
 
-            return $order;
+            return $wcOrder;
         }
 
         /**