diff --git a/admin-dev/themes/default/template/controllers/products/form.tpl b/admin-dev/themes/default/template/controllers/products/form.tpl
index c11a202e8..330b75e3d 100644
--- a/admin-dev/themes/default/template/controllers/products/form.tpl
+++ b/admin-dev/themes/default/template/controllers/products/form.tpl
@@ -76,6 +76,7 @@
 	</div>
 	<script type="text/javascript">
 		var toload = new Array();
+		var empty_pack_msg = '{l s='Pack is empty. You need to add at least one product to the pack before you can save it.'}';
 		$('#product-tab-content-wait').show();
 
 		$(document).ready(function()
diff --git a/admin-dev/themes/default/template/controllers/products/pack.tpl b/admin-dev/themes/default/template/controllers/products/pack.tpl
index 5fd256d60..118316049 100644
--- a/admin-dev/themes/default/template/controllers/products/pack.tpl
+++ b/admin-dev/themes/default/template/controllers/products/pack.tpl
@@ -161,19 +161,6 @@
 		return ids;
 	}
 
-	function handleSaveForPack()
-	{
-		// if no item left in the pack, disable save buttons
-		$("#disablePackMessage").remove();
-		if ($("#inputPackItems").val() == "")
-		{
-			disableSave();
-			$(".leadin").append('<div id="disablePackMessage" class="warn">{l s='Pack is empty. You need to add at least one product to the pack before you can save it.'}</div>');
-		}
-		else
-			enableSave();
-}
-
 </script>
 
 <h4>{l s='Pack'}</h4>
diff --git a/js/admin-products.js b/js/admin-products.js
index b4150ab03..d88886486 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -322,6 +322,19 @@ function enableSave()
 		$('#desc-product-save-and-stay').show();
 }
 
+function handleSaveForPack()
+{
+	// if no item left in the pack, disable save buttons
+	$("#disablePackMessage").remove();
+	if ($("#inputPackItems").val() == "")
+	{
+		disableSave();
+		$(".leadin").append('<div id="disablePackMessage" class="warn">' + empty_pack_msg + '</div>');
+	}
+	else
+		enableSave();
+}
+
 /* function autocomplete */
 urlToCall = null;
 
diff --git a/js/attributesBack.js b/js/attributesBack.js
index 4c77fae6c..d7938eb38 100644
--- a/js/attributesBack.js
+++ b/js/attributesBack.js
@@ -251,10 +251,12 @@ function init_elems()
 function attr_selectall()
 {
 	var elem = getE('product_att_list');
-	var i;
-
-	for (i = 0; i < elem.length; i++)
-		elem.options[i].selected = true;
+	if (elem)
+	{
+		var i;
+		for (i = 0; i < elem.length; i++)
+			elem.options[i].selected = true;
+	}
 }
 
 function del_attr_multiple()