diff --git a/htdocs/comm/address.php b/htdocs/comm/address.php
index cad05dc3166..22e992c0f8a 100644
--- a/htdocs/comm/address.php
+++ b/htdocs/comm/address.php
@@ -114,7 +114,7 @@ if ($action == 'add' || $action == 'update')
     // Update address
     else if ($action == 'update')
     {
-        $result 	= $object->update($_POST["id"], $socid, $user);
+        $result 	= $object->update($id, $socid, $user);
 
         if ($result >= 0)
         {
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index 4f9b100cd83..0f1091b37ce 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -192,12 +192,12 @@ class Address
 			$sql.= ", address = ".($this->address?"'".$this->db->escape($this->address)."'":"null");
 			$sql.= ", zip = ".($this->zip?"'".$this->db->escape($this->zip)."'":"null");
 			$sql.= ", town = ".($this->town?"'".$this->db->escape($this->town)."'":"null");
-			$sql.= ", fk_pays = '" . ($this->country_id?$this->country_id:'0') ."'";
+			$sql.= ", fk_pays = '" . ($this->country_id?$this->db->escape($this->country_id):'0') ."'";
 			$sql.= ", note = ".($this->note?"'".$this->db->escape($this->note)."'":"null");
 			$sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
 			$sql.= ", fax = ".($this->fax?"'".$this->db->escape($this->fax)."'":"null");
 			if ($user) $sql .= ",fk_user_modif = '".$user->id."'";
-			$sql .= " WHERE fk_soc = '" . $socid ."' AND rowid = '" . $id ."'";
+			$sql .= " WHERE fk_soc = '" . $socid ."' AND rowid = '" . $this->db->escape($id) ."'";
 
 			dol_syslog(get_class($this)."::Update sql=".$sql, LOG_DEBUG);
 			$resql=$this->db->query($sql);