diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php
index 565d52927..b591c6b82 100644
--- a/controllers/admin/AdminManufacturersController.php
+++ b/controllers/admin/AdminManufacturersController.php
@@ -505,7 +505,8 @@ class AdminManufacturersControllerCore extends AdminController
 
 		$this->fields_value = array(
 			'name' => Manufacturer::getNameById($address->id_manufacturer),
-			'alias' => 'manufacturer'
+			'alias' => 'manufacturer',
+			'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
 		);
 
 		$this->initToolbar();
diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php
index 923b71bc0..bcc88f291 100644
--- a/controllers/admin/AdminStoresController.php
+++ b/controllers/admin/AdminStoresController.php
@@ -291,7 +291,8 @@ class AdminStoresControllerCore extends AdminController
 			'image' => $image ? $image : false,
 			'size' => $image ? filesize(_PS_STORE_IMG_DIR_.'/'.$obj->id.'.jpg') / 1000 : false,
 			'days' => $days,
-			'hours' => isset($hours_unserialized) ? $hours_unserialized : false
+			'hours' => isset($hours_unserialized) ? $hours_unserialized : false,
+			'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
 		);
 
 		return parent::renderForm();
diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php
index 05f67a7cf..c25fb92f7 100644
--- a/controllers/admin/AdminSuppliersController.php
+++ b/controllers/admin/AdminSuppliersController.php
@@ -230,7 +230,10 @@ class AdminSuppliersControllerCore extends AdminController
 			);
 		}
 		else
-			$this->fields_value['id_address'] = 0;
+			$this->fields_value = array(
+				'id_address' => 0,
+				'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
+			);
 
 
 		if (Shop::isFeatureActive())
diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php
index 0d2d077e3..89e9a7435 100644
--- a/controllers/admin/AdminWarehousesController.php
+++ b/controllers/admin/AdminWarehousesController.php
@@ -370,22 +370,16 @@ class AdminWarehousesControllerCore extends AdminController
 				'id_state' => $address->id_state,
 			);
 		else
-			$this->fields_value['id_address'] = 0;
+			$this->fields_value = array(
+				'id_address' => 0,
+				'id_country' => Configuration::get('PS_COUNTRY_DEFAULT')
+			);
 		$this->fields_value['ids_shops[]'] = $ids_shop;
 		$this->fields_value['ids_carriers[]'] = $carriers;
 
 		return parent::renderForm();
 	}
 
-	/**
-	 * AdminController::postProcess() override
-	 * @see AdminController::postProcess()
-	 */
-	public function postProcess()
-	{
-		return parent::postProcess();
-	}
-
 	/**
 	 * @see AdminController::renderView()
 	 */