diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php
index aadd5ef8fd..130700e3b8 100644
--- a/wp-admin/menu-header.php
+++ b/wp-admin/menu-header.php
@@ -36,7 +36,8 @@ foreach ($submenu["$parent_file"] as $item) :
 	 }
 
 if ( (substr($self, -10) == substr($item[2], -10)) || (isset($plugin_page) && $plugin_page == $item[2]) ) $class = ' class="current"';
-	else $class = '';
+else if (isset($submenu_file) && $submenu_file == substr($item[2], -10)) $class = ' class="current"';	 
+else $class = '';
 
 if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}"))
 	echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";			
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index ffa6daf7f3..72ffd205db 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -31,8 +31,8 @@ $submenu['link-manager.php'][10] = array(__('Add Link'), 5, 'link-add.php');
 $submenu['link-manager.php'][15] = array(__('Link Categories'), 5, 'link-categories.php');
 $submenu['link-manager.php'][20] = array(__('Import Links'), 5, 'link-import.php');
 
-$submenu['users.php'][5] = array(__('Your Profile'), 0, 'profile.php');
-$submenu['users.php'][10] = array(__('Authors &amp; Users'), 5, 'users.php');
+$submenu['profile.php'][5] = array(__('Your Profile'), 0, 'profile.php');
+$submenu['profile.php'][10] = array(__('Authors &amp; Users'), 5, 'users.php');
 
 $submenu['options-general.php'][5] = array(__('General'), 6, 'options-general.php');
 $submenu['options-general.php'][10] = array(__('Writing'), 6, 'options-writing.php');
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index 5c65a0d3b8..36d9646f6c 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -119,7 +119,7 @@ break;
 
 
 default:
-	$parent_file = 'users.php';
+	$parent_file = 'profile.php';
 	include_once('admin-header.php');
 	$profiledata=get_userdata($user_ID);
 
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index b1da52affa..e574162856 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -2,6 +2,8 @@
 require_once('admin.php');
 
 $title = __('Edit User');
+$parent_file = 'profile.php';	
+$submenu_file = 'users.php';
 
 $wpvarstoreset = array('action', 'redirect', 'profile', 'user_id');
 for ($i=0; $i<count($wpvarstoreset); $i += 1) {
@@ -75,17 +77,12 @@ check_admin_referer();
 break;
 
 default:
-	
 include ('admin-header.php');
 
 $edituser = get_userdata($user_id);
 
 if ($edituser->user_level >= $user_level) die( __('You do not have permission to edit this user.') );
 ?>
-<ul id="adminmenu2">
-	<li><a href="profile.php"><?php _e('Your Profile') ?></a></li>
-	<li><a href="users.php" class="current"><?php _e('Authors &amp; Users') ?></a></li>
-</ul>
 
 <?php if ( isset($_GET['updated']) ) : ?>
 <div class="updated">
diff --git a/wp-admin/users.php b/wp-admin/users.php
index 838e526905..f39f90634a 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -2,7 +2,7 @@
 require_once('admin.php');
 
 $title = __('Users');
-$parent_file = 'users.php';
+$parent_file = 'profile.php';
 	
 $wpvarstoreset = array('action');
 for ($i=0; $i<count($wpvarstoreset); $i += 1) {
@@ -326,4 +326,4 @@ break;
 }
 
 include('admin-footer.php');
-?>
\ No newline at end of file
+?>