diff --git a/install-dev/upgrade/php/update_customer_default_group.php b/install-dev/upgrade/php/update_customer_default_group.php
index 03bb77b6c..9ce468a41 100644
--- a/install-dev/upgrade/php/update_customer_default_group.php
+++ b/install-dev/upgrade/php/update_customer_default_group.php
@@ -39,9 +39,27 @@ function update_customer_default_group()
 	$str_old = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)_PS_DEFAULT_CUSTOMER_GROUP_.');';
 	$str_new = 'define(\'_PS_DEFAULT_CUSTOMER_GROUP_\', '.(int)$ps_customer_group.');';				
 	$content = str_replace($str_old, $str_new, $content);
+
+	$carriers = Db::getInstance()->executeS('
+	SELECT `id_carrier`
+	FROM `'._DB_PREFIX_.'carrier`
+	WHERE `deleted` = 0');
+
+	$groups = Db::getInstance()->executeS('
+	SELECT `value` as id_group
+	FROM `'._DB_PREFIX_.'configuration`
+	WHERE `name` IN (\'PS_UNIDENTIFIED_GROUP\', \'PS_GUEST_GROUP\')');
+
 	$result = false;
+	if (count($carriers) && is_array($carriers) && count($groups) && is_array($groups))
+		foreach ($carriers as $carrier)
+			foreach ($groups as $group)
+				Db::getInstance()->execute('
+				INSERT IGNORE INTO `'._DB_PREFIX_.'carrier_group` 
+				VALUES ('.(int)$carrier['id_carrier'].', '.(int)$group['id_group'].')');
+
 	if(file_exists($filename) && is_writable($filename))
-		$result = (bool)@file_put_contents($filename, $content);
+		$result &= (bool)@file_put_contents($filename, $content);
 	if($result === true && file_exists($filename) && file_exists($filename_old))
 	{
 		@unlink($filename_old);