diff --git a/wp-admin/profile-update.php b/wp-admin/profile-update.php
index a227c64d99..755dc3e8d4 100644
--- a/wp-admin/profile-update.php
+++ b/wp-admin/profile-update.php
@@ -2,9 +2,6 @@
 
 require_once('admin.php');
 
-$parent_file = 'profile.php';
-$submenu_file = 'profile.php';
-
 check_admin_referer('update-profile_' . $user_ID);
 
 if ( !$_POST )
diff --git a/wp-admin/profile.php b/wp-admin/profile.php
index 031ca6b2ac..685d46c1c3 100644
--- a/wp-admin/profile.php
+++ b/wp-admin/profile.php
@@ -1,4 +1,4 @@
 <?php
-$is_profile_page = true;
+define('IS_PROFILE_PAGE', true);
 require_once('user-edit.php');
 ?>
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 7365d15cc7..f80df83c11 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -1,9 +1,12 @@
 <?php
 
-$is_profile_page = isset($is_profile_page) && $is_profile_page? true : false;
-
 require_once('admin.php');
 
+if ( defined('IS_PROFILE_PAGE') && IS_PROFILE_PAGE )
+	$is_profile_page = true;
+else
+	$is_profile_page = false;
+
 function profile_js ( ) {
 ?>
 <script type="text/javascript">
@@ -52,10 +55,10 @@ if ( $is_profile_page ) {
 
 $title = $is_profile_page? __('Profile') : __('Edit User');
 if ( current_user_can('edit_users') && !$is_profile_page )
-	$parent_file = 'users.php';
+	$submenu_file = 'users.php';
 else
-	$parent_file = 'profile.php';
-$submenu_file = 'users.php';
+	$submenu_file = 'profile.php';
+$parent_file = 'users.php';
 
 wp_reset_vars(array('action', 'redirect', 'profile', 'user_id', 'wp_http_referer'));