diff --git a/admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl b/admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl
index 1ead8ea87..b186deb94 100755
--- a/admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl
+++ b/admin-dev/themes/default/template/controllers/specific_price_rule/form.tpl
@@ -140,8 +140,8 @@ var last_condition_group = 0;
 var conditions = new Array();
 function toggle_condition_group(id_condition_group)
 {
-	$('.condition_group > table').fadeOut();
-	$('#condition_group_'+id_condition_group+' > table').fadeIn();
+	$('.condition_group > table').css('border', 'none');
+	$('#condition_group_'+id_condition_group+' > table').css('border', '2px solid');
 	current_id_condition_group = id_condition_group;
 }
 function add_condition(id_condition_group, type, value)
@@ -158,8 +158,8 @@ function new_condition_group()
 	var html = '<div class="condition_group" id="condition_group_'+last_condition_group+'"><h3>{l s='Condition group'} '+last_condition_group+'</h3>';
 		html += '<table cellspacing="0" cellpadding="0" class="table width2"><thead><tr><th height="39">{l s='Type'}</th><th>{l s='Value'}</th></tr></thead><tbody></tbody></table>';
 		html += '</div><div class="condition_separator">{l s='OR'}</div><div class="separation"></div>';
-	toggle_condition_group(last_condition_group);
 	$('#condition_group_list').append(html);
+	toggle_condition_group(last_condition_group);
 }
 $(document).ready(function() {
 	$('#specific_price_rule_form').live('submit', function(e) {
diff --git a/install-dev/sql/db.sql b/install-dev/sql/db.sql
index 2d0f1c611..52977cf5d 100644
--- a/install-dev/sql/db.sql
+++ b/install-dev/sql/db.sql
@@ -2339,13 +2339,13 @@ CREATE TABLE IF NOT EXISTS `PREFIX_specific_price_rule` (
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_specific_price_rule_condition_group` (
-	`id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL,
+	`id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
 	`id_specific_price_rule` INT(11) UNSIGNED NOT NULL,
 	PRIMARY KEY ( `id_specific_price_rule_condition_group`, `id_specific_price_rule` )
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_specific_price_rule_condition` (
-	`id_specific_price_rule_condition` INT(11) UNSIGNED NOT NULL,
+	`id_specific_price_rule_condition` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
 	`id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL,
 	`type` VARCHAR(255) NOT NULL,
 	`value` VARCHAR(255) NOT NULL,
@@ -2373,4 +2373,4 @@ CREATE TABLE `PREFIX_category_shop` (
   `id_shop` int(11) NOT NULL,
   PRIMARY KEY (`id_category`, `id_shop`),
   UNIQUE KEY `id_category_shop` (`id_category`,`id_shop`)
-) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
diff --git a/install-dev/sql/upgrade/1.5.0.4.sql b/install-dev/sql/upgrade/1.5.0.4.sql
index c1a42393d..eaac53bef 100644
--- a/install-dev/sql/upgrade/1.5.0.4.sql
+++ b/install-dev/sql/upgrade/1.5.0.4.sql
@@ -8,3 +8,6 @@ ALTER TABLE `PREFIX_category` ADD COLUMN `is_root_category` tinyint(1) NOT NULL
 UPDATE `PREFIX_category` SET `is_root_category` = 1 WHERE `id_category` = 1;
 
 ALTER TABLE `PREFIX_image_type` DROP `id_theme`;
+
+ALTER TABLE `PREFIX_specific_price_rule_condition` CHANGE `id_specific_price_rule_condition` `id_specific_price_rule_condition` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT;
+ALTER TABLE `PREFIX_specific_price_rule_condition_group` CHANGE `id_specific_price_rule_condition_group` `id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT;
diff --git a/install-new/data/db_structure.sql b/install-new/data/db_structure.sql
index ae957b0e0..cb3b1125f 100644
--- a/install-new/data/db_structure.sql
+++ b/install-new/data/db_structure.sql
@@ -2339,13 +2339,13 @@ CREATE TABLE IF NOT EXISTS `PREFIX_specific_price_rule` (
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_specific_price_rule_condition_group` (
-	`id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL,
+	`id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
 	`id_specific_price_rule` INT(11) UNSIGNED NOT NULL,
 	PRIMARY KEY ( `id_specific_price_rule_condition_group`, `id_specific_price_rule` )
 ) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_specific_price_rule_condition` (
-	`id_specific_price_rule_condition` INT(11) UNSIGNED NOT NULL,
+	`id_specific_price_rule_condition` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT,
 	`id_specific_price_rule_condition_group` INT(11) UNSIGNED NOT NULL,
 	`type` VARCHAR(255) NOT NULL,
 	`value` VARCHAR(255) NOT NULL,
@@ -2373,4 +2373,4 @@ CREATE TABLE `PREFIX_category_shop` (
   `id_shop` int(11) NOT NULL,
   PRIMARY KEY (`id_category`, `id_shop`),
   UNIQUE KEY `id_category_shop` (`id_category`,`id_shop`)
-) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=ENGINE_TYPE  DEFAULT CHARSET=utf8;