diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl
index 3c3e7597b..5e3ea9c1b 100644
--- a/admin-dev/themes/default/template/controllers/products/prices.tpl
+++ b/admin-dev/themes/default/template/controllers/products/prices.tpl
@@ -336,14 +336,10 @@ jQuery(document).ready(Customer.init);
 			<span id="spm_currency_sign_pre_0" style="font-weight:bold; color:#000000; font-size:12px">
 				{$currency->prefix}
 			</span>
-			<input type="text" name="sp_price" value="0" size="11" />
+			<input type="text" name="sp_price" value="{$product->price|string_format:'%.2f'}" size="11" />
 			<span id="spm_currency_sign_post_0" style="font-weight:bold; color:#000000; font-size:12px">
 				{$currency->suffix}
 			</span>
-			<p class="preference_description">
-				{l s='You can set this value to 0 in order to apply the default price.'}
-				({l s='Current:'}<span id="sp_current_ht_price">{displayWtPrice p=$product->price}</span>)
-			</p>
 		</div>
 
 		<label>{l s='Apply a discount of:'}</label>
diff --git a/classes/Product.php b/classes/Product.php
index ac7e890e2..4076a8106 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -2453,12 +2453,12 @@ class ProductCore extends ObjectModel
 		}
 		$result = self::$_pricesLevel2[$cache_id_2];
 
-		if (!$specific_price || $specific_price['price'] == 0)
+		if (!$specific_price)
 			$price = (float)$result['price'];
 		else
 			$price = (float)$specific_price['price'];
 		// convert only if the specific price is in the default currency (id_currency = 0)
-		if (!$specific_price || !($specific_price['price'] > 0 && $specific_price['id_currency']))
+		if (!$specific_price || !($specific_price['price'] >= 0 && $specific_price['id_currency']))
 			$price = Tools::convertPrice($price, $id_currency);
 
 		// Attribute price
diff --git a/modules/blocklanguages/blocklanguages.tpl b/modules/blocklanguages/blocklanguages.tpl
index 6568f4c09..b50d2427d 100644
--- a/modules/blocklanguages/blocklanguages.tpl
+++ b/modules/blocklanguages/blocklanguages.tpl
@@ -42,9 +42,9 @@
 			{if $language.iso_code != $lang_iso}
 				{assign var=indice_lang value=$language.id_lang}
 				{if isset($lang_rewrite_urls.$indice_lang)}
-					<a href="{$lang_rewrite_urls.$indice_lang}" title="{$language.name}">
+					<a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
 				{else}
-					<a href="{$link->getLanguageLink($language.id_lang)}" title="{$language.name}">
+					<a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
 
 				{/if}
 			{/if}