diff --git a/classes/Tools.php b/classes/Tools.php
index 635177f11..be4790c57 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1570,18 +1570,18 @@ class ToolsCore
 					fwrite($write_fd, $domain_rewrite_cond);
 					fwrite($write_fd, 'RewriteRule ^c/([a-zA-Z-]+)(-[0-9]+)?/.+\.jpg$ img/c/$1$2.jpg [L]'."\n");
 				}
-				// Redirections to dispatcher
-				if ($rewrite_settings)
-				{
-					fwrite($write_fd, "\n# Dispatcher\n");
-					fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -s [OR]\n");
-					fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -l [OR]\n");
-					fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -d\n");
-					fwrite($write_fd, $domain_rewrite_cond);
-					fwrite($write_fd, "RewriteRule ^.*$ - [NC,L]\n");
-					fwrite($write_fd, $domain_rewrite_cond);
-					fwrite($write_fd, "RewriteRule ^.*\$ index.php [NC,L]\n");
-				}
+			}
+			// Redirections to dispatcher
+			if ($rewrite_settings)
+			{
+				fwrite($write_fd, "\n# Dispatcher\n");
+				fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -s [OR]\n");
+				fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -l [OR]\n");
+				fwrite($write_fd, "RewriteCond %{REQUEST_FILENAME} -d\n");
+				fwrite($write_fd, $domain_rewrite_cond);
+				fwrite($write_fd, "RewriteRule ^.*$ - [NC,L]\n");
+				fwrite($write_fd, $domain_rewrite_cond);
+				fwrite($write_fd, "RewriteRule ^.*\$ index.php [NC,L]\n");
 			}
 		}
 
diff --git a/classes/shop/ShopUrl.php b/classes/shop/ShopUrl.php
index 25c2bbabc..381ac92ac 100644
--- a/classes/shop/ShopUrl.php
+++ b/classes/shop/ShopUrl.php
@@ -47,8 +47,8 @@ class ShopUrlCore extends ObjectModel
 		'fields' => array(
 			'active' => 		array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
 			'main' => 			array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
-			'domain' => 		array('type' => self::TYPE_STRING, 'required' => true, 'size' => 255),
-			'domain_ssl' => 	array('type' => self::TYPE_STRING, 'size' => 255),
+			'domain' => 		array('type' => self::TYPE_STRING, 'required' => true, 'size' => 255, 'validate' => 'isCleanHtml'),
+			'domain_ssl' => 	array('type' => self::TYPE_STRING, 'size' => 255, 'validate' => 'isCleanHtml'),
 			'id_shop' => 		array('type' => self::TYPE_INT, 'required' => true),
 			'physical_uri' => 	array('type' => self::TYPE_STRING, 'size' => 64),
 			'virtual_uri' => 	array('type' => self::TYPE_STRING, 'size' => 64),
diff --git a/modules/blockcontact/blockcontact.php b/modules/blockcontact/blockcontact.php
index fa3e30e8b..429e0da8a 100644
--- a/modules/blockcontact/blockcontact.php
+++ b/modules/blockcontact/blockcontact.php
@@ -73,10 +73,10 @@ class Blockcontact extends Module
 		<form action="'.Tools::htmlentitiesutf8($_SERVER['REQUEST_URI']).'" method="post">
 			<fieldset>			
 				<label for="telnumber">'.$this->l('Telephone number:').'</label>
-				<input type="text" id="telnumber" name="telnumber" value="'.((Configuration::get('blockcontact_telnumber') != '') ? Configuration::get('blockcontact_telnumber') : '').'" />
+				<input type="text" id="telnumber" name="telnumber" value="'.((Configuration::get('blockcontact_telnumber') != '') ? Tools::safeOutput(Configuration::get('blockcontact_telnumber')) : '').'" />
 				<div class="clear">&nbsp;</div>
 				<label for="email">'.$this->l('Email:').'</label>
-				<input type="text" id="email" name="email" value="'.((Configuration::get('blockcontact_email') != '') ? Configuration::get('blockcontact_email') : '').'" />
+				<input type="text" id="email" name="email" value="'.((Configuration::get('blockcontact_email') != '') ? Tools::safeOutput(Configuration::get('blockcontact_email')) : '').'" />
 				<div class="clear">&nbsp;</div>
 				<div class="margin-form">
 					<input type="submit" name="submitModule" value="'.$this->l('Update settings').'" class="button" /></center>
diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index 669d09a3c..c6105de32 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -38,7 +38,7 @@ countriesNeedZipCode = new Array();
 		{if isset($country.states) && $country.contains_states}
 			countries[{$country.id_country|intval}] = new Array();
 			{foreach from=$country.states item='state' name='states'}
-				countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state}', 'name' : '{$state.name|addslashes}'{rdelim});
+				countries[{$country.id_country|intval}].push({ldelim}'id' : '{$state.id_state|intval}', 'name' : '{$state.name|addslashes}'{rdelim});
 			{/foreach}
 		{/if}
 		{if $country.need_identification_number}
@@ -50,7 +50,7 @@ countriesNeedZipCode = new Array();
 	{/foreach}
 {/if}
 $(function(){ldelim}
-	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state}{else}{if isset($address)}{$address->id_state|intval}{/if}{/if}]').attr('selected', true);
+	$('.id_state option[value={if isset($smarty.post.id_state)}{$smarty.post.id_state|intval}{else}{if isset($address)}{$address->id_state|intval}{/if}{/if}]').attr('selected', true);
 {rdelim});
 //]]>
 {if $vat_management}