diff --git a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
index b4c39b412..0810b5e12 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
@@ -146,9 +146,6 @@
 					// if the tab has not already been loaded, load it now
 					tabs_manager.display(id, true);
 
-					if (btn_name == 'Associations')
-						handleSaveButtons();
-
 					tabs_manager.onLoad(id, function(){
 						$("#product-tab-content-"+id).show(0, function(){
 							$(this).trigger('displayed');
@@ -172,7 +169,7 @@
 					{
 						$('#desc-product-newCombination').hide();
 						// if pack is enabled, save button are visible only if pack is valid
-						if (btn_name != 'Informations')
+						if ($("input[name='id_product']").val() != 0 || btn_name != 'Informations')
 							handleSaveButtons();
 					}
 					hideOtherLanguage(default_language);
@@ -185,6 +182,11 @@
 				if ($('#product-tab-content-Associations').hasClass('not-loaded'))
 					disableSave();
 
+				tabs_manager.onLoad('Associations', function(){
+					if ($("input[name='id_product']").val() != 0)
+						handleSaveButtons();
+				});
+
 				$('.confirm_leave').live('click', function(){
 					// Double quotes are necessary when the translated string has single quotes
 					return confirm("{l s='You will lose all unsaved modifications. Are you sure that you\'d like to proceed?' js=1}");
diff --git a/js/admin-products.js b/js/admin-products.js
index f4ed2d7e5..2a5bfff9a 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -411,10 +411,10 @@ function handleSaveButtons(e)
 
 	// common for all products
 	$("#disableSaveMessage").remove();
+
 	if ($("#name_" + id_lang_default).val() == "" && (!display_multishop_checkboxes || $('input[name=\'multishop_check[name][' + id_lang_default + ']\']').prop('checked')))
-	{
 		msg[i++] = empty_name_msg;
-	}
+
 	// check friendly_url_[defaultlangid] only if name is ok
 	else if ($("#link_rewrite_" + id_lang_default).val() == "" && (!display_multishop_checkboxes || $('input[name=\'link_rewrite[name][' + id_lang_default + ']\']').prop('checked')))
 		msg[i++] = empty_link_rewrite_msg;