diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 4611f0d29..8d1be4162 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -1338,19 +1338,20 @@ function user_can_access_admin_page() {
 	global $pagenow;
 	global $menu;
 	global $submenu;
-	global $menu_nopriv;
+	global $_wp_menu_nopriv;
+	global $_wp_submenu_nopriv;
 	global $plugin_page;
 
 	$parent = get_admin_page_parent();
-	
-	if ( isset($menu_nopriv[$pagenow]) )
+
+	if ( isset($_wp_submenu_nopriv[$parent][$pagenow]) )
 		return false;
 
-	if ( isset($plugin_page) && isset($menu_nopriv[$plugin_page]) )
+	if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$parent][$plugin_page]) )
 		return false;
 	
 	if ( empty($parent) )
-		return true;
+		return false;
 
 	if (isset ($submenu[$parent])) {
 		foreach ($submenu[$parent] as $submenu_array) {
@@ -1364,7 +1365,6 @@ function user_can_access_admin_page() {
 	}
 
 	foreach ($menu as $menu_array) {
-		//echo "parent array: " . $menu_array[2];
 		if ($menu_array[2] == $parent) {
 			if (current_user_can($menu_array[1]))
 				return true;
@@ -1429,11 +1429,13 @@ function get_admin_page_parent() {
 	global $submenu;
 	global $pagenow;
 	global $plugin_page;
-	global $real_parent_file;
+	global $_wp_real_parent_file;
+	global $_wp_menu_nopriv;
+	global $_wp_submenu_nopriv;
 
 	if ( !empty ($parent_file) ) {
-		if ( isset($real_parent_file[$parent_file]) )
-			$parent_file = $real_parent_file[$parent_file];
+		if ( isset($_wp_real_parent_file[$parent_file]) )
+			$parent_file = $_wp_real_parent_file[$parent_file];
 
 		return $parent_file;
 	}
@@ -1442,18 +1444,30 @@ function get_admin_page_parent() {
 		foreach ($menu as $parent_menu) {
 			if ($parent_menu[2] == $plugin_page) {
 				$parent_file = $plugin_page;
-				if ( isset($real_parent_file[$parent_file]) )
-					$parent_file = $real_parent_file[$parent_file];
-					
+				if ( isset($_wp_real_parent_file[$parent_file]) )
+					$parent_file = $_wp_real_parent_file[$parent_file];
 				return $parent_file;
 			}
 		}
+		if ( isset($_wp_menu_nopriv[$plugin_page]) ) {
+			$parent_file = $plugin_page;
+			if ( isset($_wp_real_parent_file[$parent_file]) )
+					$parent_file = $_wp_real_parent_file[$parent_file];
+			return $parent_file;
+		}			
+	}
+
+	if ( isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]) ) {
+		$parent_file = $pagenow;
+		if ( isset($_wp_real_parent_file[$parent_file]) )
+			$parent_file = $_wp_real_parent_file[$parent_file];
+		return $parent_file;		
 	}
 
 	foreach (array_keys($submenu) as $parent) {
 		foreach ($submenu[$parent] as $submenu_array) {
-			if ( isset($real_parent_file[$parent]) )
-				$parent = $real_parent_file[$parent];
+			if ( isset($_wp_real_parent_file[$parent]) )
+				$parent = $_wp_real_parent_file[$parent];
 			if ($submenu_array[2] == $pagenow) {
 				$parent_file = $parent;
 				return $parent;
@@ -1488,27 +1502,28 @@ function add_menu_page($page_title, $menu_title, $access_level, $file, $function
 function add_submenu_page($parent, $page_title, $menu_title, $access_level, $file, $function = '') {
 	global $submenu;
 	global $menu;
-	global $real_parent_file;
-	global $menu_nopriv;
+	global $_wp_real_parent_file;
+	global $_wp_submenu_nopriv;
+	global $_wp_menu_nopriv;
 
 	$file = plugin_basename($file);
-	//echo "Adding $parent $file $access_level<br />";
-	if ( !current_user_can($access_level) ) {
-		$menu_nopriv[$file] = true;
-		return false;
-	}
 
 	$parent = plugin_basename($parent);
-	if ( isset($real_parent_file[$parent]) )
-		$parent = $real_parent_file[$parent];
+	if ( isset($_wp_real_parent_file[$parent]) )
+		$parent = $_wp_real_parent_file[$parent];
+
+	if ( !current_user_can($access_level) ) {
+		$_wp_submenu_nopriv[$parent][$file] = true;
+		return false;
+	}
 
 	// If the parent doesn't already have a submenu, add a link to the parent
 	// as the first item in the submenu.  If the submenu file is the same as the
 	// parent file someone is trying to link back to the parent manually.  In
 	// this case, don't automatically add a link back to avoid duplication.
-	if (!isset ($submenu[$parent]) && $file != $parent) {
+	if (!isset ($submenu[$parent]) && $file != $parent  ) {
 		foreach ($menu as $parent_menu) {
-			if ($parent_menu[2] == $parent) {
+			if ( $parent_menu[2] == $parent && current_user_can($parent_menu[1]) ) {
 				$submenu[$parent][] = $parent_menu;
 			}
 		}
diff --git a/wp-admin/index.php b/wp-admin/index.php
index 85ef56f56..a7910f709 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -1,6 +1,7 @@
 <?php
 require_once('admin.php'); 
 $title = __('Dashboard'); 
+$parent_file = 'index.php';
 require_once('admin-header.php');
 require_once (ABSPATH . WPINC . '/rss.php');
 
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 0cf0f39da..aede64bde 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -43,7 +43,7 @@ $submenu['link-manager.php'][10] = array(__('Add Link'), 'manage_links', 'link-a
 $submenu['link-manager.php'][20] = array(__('Import Links'), 'manage_links', 'link-import.php');
 
 if ( current_user_can('edit_users') ) {
-	$real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
+	$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
 	$submenu['users.php'][5] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');
 	$submenu['users.php'][10] = array(__('Your Profile'), 'read', 'profile.php');
 } else {
@@ -73,7 +73,6 @@ foreach ($menu as $menu_page) {
 foreach ($submenu as $parent => $sub) {
 	foreach ($sub as $index => $data) {
 		if ( ! current_user_can($data[1]) ) {
-			$menu_nopriv[$data[2]] = true;
 			unset($submenu[$parent][$index]);
 		}
 	}
@@ -95,29 +94,49 @@ foreach ( $menu as $id => $data ) {
 	// If the first submenu is not the same as the assigned parent,
 	// make the first submenu the new parent.
 	if ( $new_parent != $old_parent ) {
-		$real_parent_file[$old_parent] = $new_parent;
+		$_wp_real_parent_file[$old_parent] = $new_parent;
 		$menu[$id][2] = $new_parent;
 		
 		foreach ($submenu[$old_parent] as $index => $data) {
 			$submenu[$new_parent][$index] = $submenu[$old_parent][$index];
 			unset($submenu[$old_parent][$index]);
 		}
-		unset($submenu[$old_parent]);	
+		unset($submenu[$old_parent]);
+		$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
 	}
 }
 
 do_action('admin_menu', '');
 
 // Remove menus that have no accessible submenus and require privs that the user does not have.
+// Run re-parent loop again.
 foreach ( $menu as $id => $data ) {
 	// If submenu is empty...
 	if ( empty($submenu[$data[2]]) ) {
 		// And user doesn't have privs, remove menu.
 		if ( ! current_user_can($data[1]) ) {
-			$menu_nopriv[$data[2]] = true;
+			$_wp_menu_nopriv[$data[2]] = true;
 			unset($menu[$id]);
 		}
-	} 
+	} else {
+	/*	$subs = $submenu[$data[2]];
+		$first_sub = array_shift($subs);
+		$old_parent = $data[2];
+		$new_parent = $first_sub[2];
+		// If the first submenu is not the same as the assigned parent,
+		// make the first submenu the new parent.
+		if ( $new_parent != $old_parent ) {
+			$_wp_real_parent_file[$old_parent] = $new_parent;
+			$menu[$id][2] = $new_parent;
+		
+			foreach ($submenu[$old_parent] as $index => $data) {
+				$submenu[$new_parent][$index] = $submenu[$old_parent][$index];
+				unset($submenu[$old_parent][$index]);
+			}
+			unset($submenu[$old_parent]);
+			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+		} */
+	}
 }
 
 ksort($menu); // make it all pretty