diff --git a/admin-dev/themes/template/shop/form.tpl b/admin-dev/themes/template/shop/form.tpl
index 478341057..c46ae72a4 100644
--- a/admin-dev/themes/template/shop/form.tpl
+++ b/admin-dev/themes/template/shop/form.tpl
@@ -72,13 +72,13 @@
 				{elseif $key == 'select'}
 						<select name="{$field.name}" id="{$field.name}">
 							{foreach $field.options.query AS $key => $option}
-								<option value="{$key}" {if $key == $defaultGroup}selected="selected"{/if}>
+								<option value="{$key}" {if $key == $defaultShop}selected="selected"{/if}>
 									{$option.name}
 								</option>
 							{/foreach}
 						</select>
 				{elseif $key == 'allcheckbox'}
-						<div id="importList" {if !$checked}style="display:none"{/if}>
+						<div id="importList" style="clear:both;{if !$checked}display:none{/if}">
 							<ul>
 								{foreach $field.values as $key => $label}
 									<li><label><input type="checkbox" name="importData[{$key}]" checked="checked" /> {$label}</label></li>
diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php
index 135c1f9f0..4830a5890 100755
--- a/controllers/admin/AdminShopController.php
+++ b/controllers/admin/AdminShopController.php
@@ -243,8 +243,6 @@ class AdminShopControllerCore extends AdminController
 
 		if (Shop::getTotalShops() > 1 && $obj->id)
 			$disabled = array(
-				'share_customer' => true,
-				'share_order' => true,
 				'active' => false
 			);
 		else
@@ -292,7 +290,7 @@ class AdminShopControllerCore extends AdminController
 					'type' => 'select',
 					'name' => 'importFromShop',
 					'options' => array(
-						'query' => Shop::getTree(),
+						'query' => Shop::getShops(false),
 						'name' => 'name'
 					)
 				),
@@ -310,7 +308,7 @@ class AdminShopControllerCore extends AdminController
 		$this->tpl_form_vars = array(
 			'disabled' => $disabled,
 			'checked' => (Tools::getValue('addshop') !== false) ? true : false,
-			'defaultGroup' => Shop::getInstance(Configuration::get('PS_SHOP_DEFAULT'))->getGroupID(),
+			'defaultShop' => (int)Configuration::get('PS_SHOP_DEFAULT'),
 		);
 
 		if (isset($this->fields_import_form))