diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php
index 190f6482f..88148abbe 100755
--- a/controllers/admin/AdminShopController.php
+++ b/controllers/admin/AdminShopController.php
@@ -248,8 +248,22 @@ class AdminShopControllerCore extends AdminController
 
 	protected function afterAdd($new_shop)
 	{
-		if (Tools::getValue('useImportData') && ($import_data = Tools::getValue('importData')) && is_array($import_data))
+		$import_data = Tools::getValue('importData');
+		if (Tools::getValue('useImportData') && is_array($import_data))
 			$new_shop->copyShopData((int)Tools::getValue('importFromShop'), $import_data);
+
+		// copy default data
+		if (!Tools::getValue('useImportData') || (is_array($import_data) && !isset($import_data['group'])))
+		{
+			$sql = 'INSERT INTO `'._DB_PREFIX_.'group_shop` (`id_shop`, `id_group`)
+					VALUES
+					('.(int)$new_shop->id.', '.(int)Configuration::get('PS_UNIDENTIFIED_GROUP').'),
+					('.(int)$new_shop->id.', '.(int)Configuration::get('PS_GUEST_GROUP').'),
+					('.(int)$new_shop->id.', '.(int)Configuration::get('PS_CUSTOMER_GROUP').')
+				';
+			Db::getInstance()->execute($sql);
+		}
+
 		return parent::afterAdd($new_shop);
 	}
 
@@ -540,45 +554,40 @@ class AdminShopControllerCore extends AdminController
 				$parent_id = (int)Tools::getValue('id_parent', 1);
 				$this->afterAdd($object);
 				$this->updateAssoShop($object->id);
-
-				// datas to import
-				$import_data = Tools::getValue('importData');
-
-				// specific import for stock
-				if (isset($import_data['stock_available']) && isset($import_data['product']) && Tools::isSubmit('useImportData'))
-				{
-					$id_src_shop = (int)Tools::getValue('importFromShop');
-					if ($object->getGroup()->share_stock == false)
-						StockAvailable::copyStockAvailableFromShopToShop($id_src_shop, $object->id);
-				}
-
-				// if we import datas from another shop, we do not update the shop categories
-				if (!Category::updateFromShop(Tools::getValue('categoryBox'), $object->id))
-					$this->errors[] = $this->l('You need to select at least the root category.');
-
 				// Save and stay on same form
-				if (!$this->errors)
-				{
-					if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
-						$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.$object->id.'&conf=3&update'.$this->table.'&token='.$this->token;
-					// Save and back to parent
-					if (Tools::isSubmit('submitAdd'.$this->table.'AndBackToParent'))
-						$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.$parent_id.'&conf=3&token='.$this->token;
-					// Default behavior (save and back)
-					if (empty($this->redirect_after))
-						$this->redirect_after = self::$currentIndex.($parent_id ? '&'.$this->identifier.'='.$object->id : '').'&conf=3&token='.$this->token;
-				}
+				if (Tools::isSubmit('submitAdd'.$this->table.'AndStay'))
+					$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.$object->id.'&conf=3&update'.$this->table.'&token='.$this->token;
+				// Save and back to parent
+				if (Tools::isSubmit('submitAdd'.$this->table.'AndBackToParent'))
+					$this->redirect_after = self::$currentIndex.'&'.$this->identifier.'='.$parent_id.'&conf=3&token='.$this->token;
+				// Default behavior (save and back)
+				if (empty($this->redirect_after))
+					$this->redirect_after = self::$currentIndex.($parent_id ? '&'.$this->identifier.'='.$object->id : '').'&conf=3&token='.$this->token;
 			}
 		}
 
 		$this->errors = array_unique($this->errors);
-		if (!empty($this->errors))
+		if (count($this->errors) > 0)
 		{
-			// if we have errors, we stay on the form instead of going back to the list
-			$this->display = 'edit';
-			return false;
+            $this->display = 'add';
+            return;
 		}
 
+		// datas to import
+		$import_data = Tools::getValue('importData');
+
+		// specific import for stock
+		if (isset($import_data['stock_available']) && isset($import_data['product']) && Tools::isSubmit('useImportData'))
+		{
+			$id_src_shop = (int)Tools::getValue('importFromShop');
+			if ($object->getGroup()->share_stock == false)
+				StockAvailable::copyStockAvailableFromShopToShop($id_src_shop, $object->id);
+		}
+
+		// if we import datas from another shop, we do not update the shop categories
+		if (!isset($import_data['category']))
+			Category::updateFromShop(Tools::getValue('categoryBox'), $object->id);
+
 		return $object;
 	}