diff --git a/controllers/front/AddressController.php b/controllers/front/AddressController.php
index 37d9bbceb..bc46cd678 100644
--- a/controllers/front/AddressController.php
+++ b/controllers/front/AddressController.php
@@ -182,7 +182,10 @@ class AddressControllerCore extends FrontController
 			&& Db::getInstance()->getValue('
 				SELECT count(*)
 				FROM '._DB_PREFIX_.'address
-				WHERE `alias` = \''.pSql($_POST['alias']).'\' AND id_customer = '.(int)$this->context->customer->id) > 0)
+				WHERE `alias` = \''.pSql($_POST['alias']).'\'
+				AND id_address != '.(int)Tools::getValue('id_address').'
+				AND id_customer = '.(int)$this->context->customer->id.'
+				AND deleted = 0') > 0)
 			$this->errors[] = sprintf(Tools::displayError('The alias "%s" is already used, please chose an other one.'), Tools::safeOutput($_POST['alias']));
 
 		// Don't continue this process if we have errors !
diff --git a/themes/default/address.tpl b/themes/default/address.tpl
index 9a58d4323..b05e8ea47 100644
--- a/themes/default/address.tpl
+++ b/themes/default/address.tpl
@@ -226,7 +226,7 @@ $(function(){ldelim}
 		</p>
 		<p class="required text" id="adress_alias">
 			<label for="alias">{l s='Assign an address title for future reference'} <sup>*</sup></label>
-			<input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else}{if isset($address->alias)}{$address->alias|escape:'htmlall':'UTF-8'}{/if}{if isset($select_address)}{l s='My address'}{/if}{/if}" />
+			<input type="text" id="alias" name="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else if isset($address->alias)}{$address->alias|escape:'htmlall':'UTF-8'}{else if isset($select_address)}{l s='My address'}{/if}" />
 		</p>
 	</fieldset>
 	<p class="submit2">