diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php
index 6d9bd6cb8..8f2ed09f0 100644
--- a/classes/helper/HelperList.php
+++ b/classes/helper/HelperList.php
@@ -444,13 +444,13 @@ class HelperListCore extends Helper
 			self::$cache_lang['Delete'] = $this->l('Delete', 'Helper');
 
 		if (!array_key_exists('DeleteItem', self::$cache_lang))
-			self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper', false, false);
+			self::$cache_lang['DeleteItem'] = $this->l('Delete selected item?', 'Helper', true, false);
 
 		if (!array_key_exists('Name', self::$cache_lang))
-			self::$cache_lang['Name'] = $this->l('Name:', 'Helper', false, false);
+			self::$cache_lang['Name'] = $this->l('Name:', 'Helper', true, false);
 
 		if (!is_null($name))
-			$name = '\n\n'.self::$cache_lang['Name'].' '.$name;
+			$name = addcslashes('\n\n'.self::$cache_lang['Name'].' '.$name, '\'');
 
 		$data = array(
 			$this->identifier => $id,
@@ -459,7 +459,7 @@ class HelperListCore extends Helper
 		);
 		
 		if ($this->specificConfirmDelete !== false)
-			$data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : Tools::safeOutput(addcslashes(self::$cache_lang['DeleteItem'].$name, '\''));
+			$data['confirm'] = !is_null($this->specificConfirmDelete) ? '\r'.$this->specificConfirmDelete : Tools::safeOutput(self::$cache_lang['DeleteItem'].$name);
 		
 		$tpl->assign(array_merge($this->tpl_delete_link_vars, $data));
 
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 763938627..d6b44706c 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -367,9 +367,9 @@ class AdminProductsControllerCore extends AdminController
 				{
 					if (is_array($default_product->$field_name))
 						foreach ($default_product->$field_name as $key => $value)
-							$this->object->{$field_name}[$key] = ObjectModel::formatValue($value, $def['fields'][$field_name]['type']);
+							$this->object->{$field_name}[$key] = $value;
 					else
-						$this->object->$field_name = ObjectModel::formatValue($default_product->$field_name, $def['fields'][$field_name]['type']);
+						$this->object->$field_name = $default_product->$field_name;
 				}
 			}
 			$this->object->loadStockData();