diff --git a/src/include/class-wc-retailcrm-orders.php b/src/include/class-wc-retailcrm-orders.php
index 7929f13..67ce678 100644
--- a/src/include/class-wc-retailcrm-orders.php
+++ b/src/include/class-wc-retailcrm-orders.php
@@ -241,9 +241,9 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
                 ));
 
                 if (empty($crmCorporate)) {
-	                $crmCorporate = $this->customers->searchCorporateCustomer(array(
-		                'companyName' => $wcOrder->get_billing_company()
-	                ));
+                    $crmCorporate = $this->customers->searchCorporateCustomer(array(
+                        'companyName' => $wcOrder->get_billing_company()
+                    ));
                 }
 
                 if (empty($crmCorporate)) {
@@ -371,6 +371,10 @@ if ( ! class_exists( 'WC_Retailcrm_Orders' ) ) :
                 return;
             }
 
+            if ($order->get_status() == 'auto-draft') {
+                return;
+            }
+
             if ($update === true) {
                 $this->orders->is_new = false;
             }
diff --git a/src/include/order/class-wc-retailcrm-order.php b/src/include/order/class-wc-retailcrm-order.php
index 4adaf56..8af5530 100644
--- a/src/include/order/class-wc-retailcrm-order.php
+++ b/src/include/order/class-wc-retailcrm-order.php
@@ -56,15 +56,16 @@ class WC_Retailcrm_Order extends WC_Retailcrm_Abstracts_Data
         $firstName = $order->get_shipping_first_name();
         $lastName = $order->get_shipping_last_name();
 
-        if(empty($firstName) && empty($lastName))
-        {
+        if (empty($firstName) && empty($lastName)) {
             $firstName = $order->get_billing_first_name();
             $lastName = $order->get_billing_last_name();
         }
-        
+
+        $dateCreate = $order->get_date_created();
+
         $data = array(
             'externalId' => $order->get_id(),
-            'createdAt' => $order->get_date_created()->date('Y-m-d H:i:s'),
+            'createdAt' => !empty($dateCreate) ? $dateCreate->date('Y-m-d H:i:s') : date('Y-m-d H:i:s'),
             'firstName' => $firstName,
             'lastName' => $lastName,
             'email' => strtolower($order->get_billing_email()),
@@ -105,14 +106,14 @@ class WC_Retailcrm_Order extends WC_Retailcrm_Abstracts_Data
     /**
      * @param WC_Order $order
      */
-	protected function set_number($order)
-	{
-		if (isset($this->settings['update_number']) && $this->settings['update_number'] == WC_Retailcrm_Base::YES ) {
-			$this->set_data_field('number', $order->get_order_number());
-		} else {
-			unset($this->data['number']);
-		}
-	}
+    protected function set_number($order)
+    {
+        if (isset($this->settings['update_number']) && $this->settings['update_number'] == WC_Retailcrm_Base::YES ) {
+            $this->set_data_field('number', $order->get_order_number());
+        } else {
+            unset($this->data['number']);
+        }
+    }
 
     public function reset_data()
     {