diff --git a/admin-dev/themes/template/products/quantities.tpl b/admin-dev/themes/template/products/quantities.tpl
index 8088d8c6d..54ba18c78 100644
--- a/admin-dev/themes/template/products/quantities.tpl
+++ b/admin-dev/themes/template/products/quantities.tpl
@@ -60,7 +60,7 @@
 			<tbody>
 				<tr>
 					<td valign="top" style="vertical-align:top;">
-						<input {if $product->advanced_stock_management == 1 && $stock_management_active == 1}value="on" checked="checked" {/if} {if $stock_management_active == 0}disabled="disabled" {/if} 
+						<input {if $product->advanced_stock_management == 1 && $stock_management_active == 1}value="1" checked="checked" {/if} {if $stock_management_active == 0}disabled="disabled" {/if} 
 								type="checkbox" name="advanced_stock_management" class="advanced_stock_management" id="advanced_stock_management" />
 						<label style="float:none;font-weight:normal" for="advanced_stock_management">{l s='I want to use the advanced stock management system for this product'} {if $stock_management_active == 0}&nbsp;-&nbsp;<b>{l s='Not possible if stock management is not enabled'}</b>{/if}</label>
 						<br /><br />
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 555b60af6..75009081e 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -1154,8 +1154,8 @@ class AdminProductsControllerCore extends AdminController
 						$combinations[$key]['is_shareable'] = $product_download[0]['is_shareable'];
 					}
 				}
-				
-					
+
+
 				die(Tools::jsonEncode($combinations));
 			}
 		}
@@ -2217,7 +2217,7 @@ class AdminProductsControllerCore extends AdminController
 				if (!in_array($associated_supplier->id_supplier, $suppliers_to_associate))
 				{
 					$associated_supplier->delete();
-					unset($associated_supplier);
+					unset($associated_suppliers[$key]);
 				}
 
 			// Associate suppliers
@@ -2334,7 +2334,7 @@ class AdminProductsControllerCore extends AdminController
 							}
 						}
 					}
-					else
+					else if (Tools::isSubmit('supplier_reference_'.$product->id.'_'.$attribute['id_product_attribute'].'_'.$supplier->id_supplier))
 					{
 						//int attribute with default values if possible
 						if ((int)$attribute['id_product_attribute'] > 0)
@@ -2680,7 +2680,7 @@ class AdminProductsControllerCore extends AdminController
 
 	public function initFormVirtualProduct($product, $languages, $default_language)
 	{
-		
+
 		$data = $this->context->smarty->createData();
 
 		$currency = $this->context->currency;