diff --git a/e107_admin/admin.php b/e107_admin/admin.php
index e6bf074b2..0a9be9f54 100644
--- a/e107_admin/admin.php
+++ b/e107_admin/admin.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/admin.php,v $
-|     $Revision: 1.11 $
-|     $Date: 2009-07-04 13:36:15 $
+|     $Revision: 1.12 $
+|     $Date: 2009-08-05 14:20:39 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -229,7 +229,7 @@ $array_functions_assoc = convert_core_icons($newarray);
 
 function convert_core_icons($newarray)  // Put core button array in the same format as plugin button array.
 {
-    foreach($newarray as $val)
+    foreach($newarray as $key=>$val)
 	{
 		$key = "e-".basename($val[0],".php");
 		$val['icon'] = $val[5];
@@ -237,9 +237,10 @@ function convert_core_icons($newarray)  // Put core button array in the same for
 		$val['title'] = $val[1];
 		$val['link'] = $val[0];
 		$val['caption'] = $val['2'];
-		$val['perms'] = $val['4'];
+		$val['perms'] = $val['3'];
 		$array_functions_assoc[$key] = $val;
 	}
+
     return $array_functions_assoc;
 }
 
diff --git a/e107_admin/header.php b/e107_admin/header.php
index a2f3d5724..d5fc34c9d 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -4,7 +4,7 @@
 |        e107 website system
 |        /e107_admin/header.php
 |
-|        ©Steve Dunstan 2001-2002
+|        ©Steve Dunstan 2001-2002
 |        http://e107.org
 |        jalist@e107.org
 |
@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |   $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
-|   $Revision: 1.41 $
-|   $Date: 2009-07-23 08:14:55 $
-|   $Author: marj_nl_fr $
+|   $Revision: 1.42 $
+|   $Date: 2009-08-05 14:20:40 $
+|   $Author: e107coders $
 +---------------------------------------------------------------+
 */
 
@@ -486,6 +486,13 @@ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_li
 	$search[9] = '/\{LINK_IMAGE\}(.*?)/si';
 	foreach (array_keys($e107_vars) as $act)
 	{
+        if(($e107_vars[$act]['perm']!='') && !getperms($e107_vars[$act]['perm'])) // check perms first.
+		{
+          	continue;
+		}
+
+      //  print_a($e107_vars[$act]);
+
 		$replace = array();
 		if ($active_page == $act || (str_replace("?", "", e_PAGE.e_QUERY) == str_replace("?", "", $act)))
 		{
@@ -531,7 +538,7 @@ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_li
 	if($sub_link || empty($title)) return $text;
 
 
-	$e107->ns->tablerender($title, $text, array('id' => $id, 'style' => 'button_menu'));
+  	$e107->ns->tablerender($title, $text, array('id' => $id, 'style' => 'button_menu'));
 	return '';
 }
 
diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index 4d70e05c7..340a50cbf 100644
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -12,8 +12,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/includes/infopanel.php,v $
-|     $Revision: 1.5 $
-|     $Date: 2009-07-23 10:46:11 $
+|     $Revision: 1.6 $
+|     $Date: 2009-08-05 14:20:41 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -98,7 +98,7 @@ $text .= "
 
 foreach ($iconlist as $key => $val)
 {
-	if (in_array($key,$user_pref['core-infopanel-mye107']))
+	if (!isset($user_pref['core-infopanel-mye107']) || in_array($key,$user_pref['core-infopanel-mye107']) )
 	{
 		$text .= render_links($val['link'],$val['title'],$val['caption'],$val['perms'],$val['icon_32'],"div");
 	}
@@ -117,9 +117,12 @@ $text .= "<div class='clear'>&nbsp;</div>
 
 foreach ($iconlist as $key => $icon)
 {
-	$checked = (in_array($key,$user_pref['core-infopanel-mye107'])) ? true : false;
-	$text .= "<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>
+	if(getperms($icon['perms']))
+	{
+		$checked = (varset($user_pref['core-infopanel-mye107']) && in_array($key,$user_pref['core-infopanel-mye107'])) ? true : false;
+		$text .= "<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>
                         ".$icon['icon'].$frm->checkbox('e-mye107[]',$key,$checked).$icon['title']."</div>";
+	}
 }
 
 
@@ -127,9 +130,12 @@ if (is_array($pluglist))
 {
 	foreach ($pluglist as $key => $icon)
 	{
-		$checked = (in_array('p-'.$key,$user_pref['core-infopanel-mye107'])) ? true : false;
-		$text .= "<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>
+    	if(getperms($icon['perms']))
+		{
+			$checked = (in_array('p-'.$key,$user_pref['core-infopanel-mye107'])) ? true : false;
+			$text .= "<div class='left f-left list field-spacer' style='display:block;height:24px;width:200px;'>
 	                         ".$icon['icon'].$frm->checkbox('e-mye107[]',$key,$checked).$icon['title']."</div>";
+		}
 	}
 }
 $text .= "<div class='clear'>&nbsp;</div>";