diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 709d7690c74..de6a320e2b9 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -185,12 +185,12 @@ class Adherent extends CommonObject
 	function makeSubstitution($text)
 	{
 		global $langs;
-		
+
 		$birthday = dol_print_date($this->naiss,'day');
-		
+
 		$msgishtml = 0;
 		if (dol_textishtml($text,1)) $msgishtml = 1;
-		
+
 		$infos='';
 		if ($this->civilite_id) $infos.= $langs->transnoentities("UserTitle").": ".$this->getCivilityLabel(1)."\n";
 		$infos.= $langs->transnoentities("id").": ".$this->id."\n";
@@ -207,7 +207,7 @@ class Adherent extends CommonObject
 		$infos.= $langs->transnoentities("Birthday").": ".$birthday."\n";
 		$infos.= $langs->transnoentities("Photo").": ".$this->photo."\n";
 		$infos.= $langs->transnoentities("Public").": ".yn($this->public);
-		
+
 		// Substitutions
 		$substitutionarray=array(
 				'%DOL_MAIN_URL_ROOT%'=>DOL_MAIN_URL_ROOT,
@@ -227,9 +227,9 @@ class Adherent extends CommonObject
 				'%LOGIN%'=>$msgishtml?dol_htmlentitiesbr($this->login):$this->login,
 				'%PASSWORD%'=>$msgishtml?dol_htmlentitiesbr($this->pass):$this->pass
 		);
-		
+
 		complete_substitutions_array($substitutionarray, $langs);
-		
+
 		return make_substitutions($text,$substitutionarray);
 	}
 
@@ -696,6 +696,10 @@ class Adherent extends CommonObject
         $resql=$this->db->query($sql);
         if ($resql)
         {
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_member WHERE fk_member = ".$rowid;
+            dol_syslog(get_class($this)."::delete sql=".$sql);
+            $resql=$this->db->query($sql);
+
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."cotisation WHERE fk_adherent = ".$rowid;
             dol_syslog(get_class($this)."::delete sql=".$sql);
             $resql=$this->db->query($sql);
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index cd15b82eb42..e1c0b73fa70 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -1506,7 +1506,7 @@ if ($rowid && $action != 'edit')
 		}
 
 	    // Action SPIP
-	    if ($conf->global->ADHERENT_USE_SPIP)
+	    if ($conf->mailmanspip->enabled && $conf->global->ADHERENT_USE_SPIP)
 	    {
 	        $isinspip=$object->is_in_spip();
 	        if ($isinspip == 1)