diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 85665280275..a1b61358820 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -447,33 +447,33 @@ class Adherent extends CommonObject
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."adherent SET";
-        $sql.= " civility = ".(!is_null($this->civility_id)?$this->db->escape($this->civility_id):"null");
+        $sql.= " civility = ".($this->civility_id>0?$this->db->escape($this->civility_id):"null");
         $sql.= ", firstname = ".($this->firstname?"'".$this->db->escape($this->firstname)."'":"null");
-        $sql.= ", lastname=" .($this->lastname?"'".$this->db->escape($this->lastname)."'":"null");
-        $sql.= ", login="   .($this->login?"'".$this->db->escape($this->login)."'":"null");
-        $sql.= ", societe=" .($this->societe?"'".$this->db->escape($this->societe)."'":"null");
-        $sql.= ", fk_soc="  .($this->fk_soc > 0?$this->db->escape($this->fk_soc):"null");
-        $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.= ", country=".($this->country_id>0?$this->db->escape($this->country_id):"null");
-        $sql.= ", state_id=".($this->state_id>0?$this->db->escape($this->state_id):"null");
-        $sql.= ", email='".$this->db->escape($this->email)."'";
-        $sql.= ", skype='".$this->db->escape($this->skype)."'";
-        $sql.= ", phone="   .($this->phone?"'".$this->db->escape($this->phone)."'":"null");
-        $sql.= ", phone_perso=" .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null");
-        $sql.= ", phone_mobile=" .($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null");
-        $sql.= ", note_private=" .($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
-        $sql.= ", note_public=" .($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
-        $sql.= ", photo="   .($this->photo?"'".$this->db->escape($this->photo)."'":"null");
-        $sql.= ", public='".$this->db->escape($this->public)."'";
-        $sql.= ", statut="  .$this->statut;
-        $sql.= ", fk_adherent_type=".$this->typeid;
-        $sql.= ", morphy='".$this->db->escape($this->morphy)."'";
-        $sql.= ", birth="   .($this->birth?"'".$this->db->idate($this->birth)."'":"null");
-        if ($this->datefin)   $sql.= ", datefin='".$this->db->idate($this->datefin)."'";		// Must be modified only when deleting a subscription
-        if ($this->datevalid) $sql.= ", datevalid='".$this->db->idate($this->datevalid)."'";	// Must be modified only when validating a member
-        $sql.= ", fk_user_mod=".($user->id>0?$user->id:'null');	// Can be null because member can be create by a guest
+        $sql.= ", lastname = ".($this->lastname?"'".$this->db->escape($this->lastname)."'":"null");
+        $sql.= ", login = ".($this->login?"'".$this->db->escape($this->login)."'":"null");
+        $sql.= ", societe = ".($this->societe?"'".$this->db->escape($this->societe)."'":"null");
+        $sql.= ", fk_soc = ".($this->fk_soc > 0?$this->db->escape($this->fk_soc):"null");
+        $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.= ", country = ".($this->country_id>0?$this->db->escape($this->country_id):"null");
+        $sql.= ", state_id = ".($this->state_id>0?$this->db->escape($this->state_id):"null");
+        $sql.= ", email = '".$this->db->escape($this->email)."'";
+        $sql.= ", skype = '".$this->db->escape($this->skype)."'";
+        $sql.= ", phone = ".($this->phone?"'".$this->db->escape($this->phone)."'":"null");
+        $sql.= ", phone_perso = ".($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null");
+        $sql.= ", phone_mobile = ".($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null");
+        $sql.= ", note_private = ".($this->note_private?"'".$this->db->escape($this->note_private)."'":"null");
+        $sql.= ", note_public = ".($this->note_public?"'".$this->db->escape($this->note_public)."'":"null");
+        $sql.= ", photo = ".($this->photo?"'".$this->db->escape($this->photo)."'":"null");
+        $sql.= ", public = '".$this->db->escape($this->public)."'";
+        $sql.= ", statut = ".$this->statut;
+        $sql.= ", fk_adherent_type = ".$this->typeid;
+        $sql.= ", morphy = '".$this->db->escape($this->morphy)."'";
+        $sql.= ", birth = ".($this->birth?"'".$this->db->idate($this->birth)."'":"null");
+        if ($this->datefin)   $sql.= ", datefin = '".$this->db->idate($this->datefin)."'";		// Must be modified only when deleting a subscription
+        if ($this->datevalid) $sql.= ", datevalid = '".$this->db->idate($this->datevalid)."'";	// Must be modified only when validating a member
+        $sql.= ", fk_user_mod = ".($user->id>0?$user->id:'null');	// Can be null because member can be create by a guest
         $sql.= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::update update member", LOG_DEBUG);