diff --git a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
index 571ecfe9e..b321b7ba5 100644
--- a/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/attributes/helpers/form/form.tpl
@@ -69,10 +69,10 @@
 	var changeAssociationGroup = function()
 	{
 		var id_attribute_group = $('#id_attribute_group').val();
-		$('.input_shop_group').each(function(k, item)
+		$('.input_shop').each(function(k, item)
 		{
-			var id_shop_group = $(item).val();
-			if (typeof shop_associations[id_attribute_group] != 'undefined' && $.inArray(id_shop_group, shop_associations[id_attribute_group]) > -1)
+			var id_shop = $(item).val();
+			if (typeof shop_associations[id_attribute_group] != 'undefined' && $.inArray(id_shop, shop_associations[id_attribute_group]) > -1)
 				$(item).attr('disabled', false);
 			else
 			{
diff --git a/admin-dev/themes/default/template/helpers/form/assoshop.tpl b/admin-dev/themes/default/template/helpers/form/assoshop.tpl
index 8331ea99f..d0d369eb8 100644
--- a/admin-dev/themes/default/template/helpers/form/assoshop.tpl
+++ b/admin-dev/themes/default/template/helpers/form/assoshop.tpl
@@ -114,7 +114,7 @@ function check_all_shop() {
 							<label class="child">
 								<input class="input_shop"
 									type="checkbox"
-									value="{$groupID}"
+									value="{$shopID}"
 									name="checkBoxShopAsso_{$table}[{$form_id}][{$shopID}]"
 									id="checkedBox_{$shopID}"
 									{if $checked} checked="checked"{/if} />
diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index bc7071ee5..d3e204111 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -293,7 +293,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 			$sql = 'SELECT id_attribute_group, id_shop FROM '._DB_PREFIX_.'attribute_group_shop';
 			$associations = array();
 			foreach (Db::getInstance()->executeS($sql) as $row)
-				$associations[$row['id_attribute_group']][] = $row['id_shop_group'];
+				$associations[$row['id_attribute_group']][] = $row['id_shop'];
 
 			$this->fields_form['input'][] = array(
 				'type' => 'shop',
@@ -306,6 +306,7 @@ class AdminAttributesGroupsControllerCore extends AdminController
 			$associations = array();
 
 		$this->fields_form['shop_associations'] = Tools::jsonEncode($associations);
+
 		$this->fields_form['input'][] = array(
 			'type' => 'color',
 			'label' => $this->l('Color:'),