diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index b98b34ded05..0f2b92622c0 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -690,6 +690,9 @@ class Adherent extends CommonObject
 		$error=0;
 		$errorflag=0;
 
+		// Check parameters
+		if (empty($rowid)) $rowid=$this->id;
+
         $this->db->begin();
 
         // Remove category
@@ -1103,7 +1106,7 @@ class Adherent extends CommonObject
                 if (count($extralabels)>0) {
                 	$this->fetch_optionals($this->id,$extralabels);
                 }
-                
+
                 // Load other properties
                 $result=$this->fetch_subscriptions();
 
@@ -1534,7 +1537,7 @@ class Adherent extends CommonObject
         	$lien = '<a href="'.DOL_URL_ROOT.'/categories/categorie.php?id='.$this->id.'&type=3">';
         	$lienfin='</a>';
         }
-        
+
         $picto='user';
         $label=$langs->trans("ShowMember");
 
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 6bee9a606ca..5a39f4b09ef 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -823,9 +823,9 @@ if (! defined('NOREQUIREMENU'))
 		foreach($dirmenus as $dirmenu)
 		{
 			$menufound=dol_include_once($dirmenu."standard/".$file_menu);
-			if ($menufound) break;
+			if (class_exists('MenuManager')) break;
 		}
-		if (! $menufound)	// If failed to include, we try with standard
+		if (! class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
 		{
 			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
 			$file_menu='eldy_menu.php';
@@ -987,7 +987,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
             	//$arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
             	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jquerytreeview/jquery.treeview.css" />'."\n";
             }
-            
+
         }
 
         print '<!-- Includes CSS for Dolibarr theme -->'."\n";