diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index d8fadd814..5461d5ee0 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -3207,7 +3207,7 @@ class e107
 		}
 
 
-		define('e_ADMIN_AREA', $inAdminDir);	
+		define('e_ADMIN_AREA', ($inAdminDir  && !deftrue('USER_AREA')));
 		define('ADMINDIR', $ADMIN_DIRECTORY);
 
 		define('SITEURLBASE', $this->HTTP_SCHEME.'://'.$_SERVER['HTTP_HOST']);
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index 2e7a301c0..ff126f72d 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -1043,7 +1043,6 @@ class e_menuManager {
 
 		$text .= "</tr></table>";
 
-		/** FIXME (SecretR - this block is breaking menu manager ($this->menu_areas is always empty )
 		if(!count($this->menu_areas))
 		{
 			$text = "<div class='alert alert-block alert-warning text-left'>";
@@ -1057,7 +1056,6 @@ class e_menuManager {
 			
 			$text .= "</div>";
 		}
-		*/
 	//	$ns -> tablerender(MENLAN_22.'blabla', $text);
 		echo $this->renderPanel(MENLAN_22, $text);
         echo $rs->form_close();