diff --git bp-core/admin/bp-core-admin.php bp-core/admin/bp-core-admin.php
index 64ed7fe..a982ee6 100644
--- bp-core/admin/bp-core-admin.php
+++ bp-core/admin/bp-core-admin.php
@@ -73,13 +73,14 @@ function bp_core_admin_tabs( $active_tab = '' ) {
  * @todo Add convenience links into the markup once new positions are finalised.
  */
 function bp_core_admin_backpat_page() {
+	$settings_url = add_query_arg( 'page', 'bp-general-config', bp_core_do_network_admin() ? network_admin_url( 'settings.php' ) : admin_url( 'options-general.php' ) );
 ?>
 	<div class="wrap">
 		<?php screen_icon( 'buddypress'); ?>
 		<h2><?php _e( 'Why have all my BuddyPress menus disappeared?', 'buddypress' ); ?></h2>
 
 		<p><?php _e( "Don't worry! We've moved the BuddyPress options into more convenient and easier to find locations. You're seeing this page because you are running a legacy BuddyPress plugin which has not been updated.", 'buddypress' ); ?></p>
-		<p><?php printf( __( 'Components, Pages, Settings, and Forums, have been moved to <a href="%s">Settings &gt; BuddyPress</a>. Profile Fields has been moved into the <a href="%s">Users</a> menu.', 'buddpress' ), network_admin_url( 'options-general.php?page=bp-general-config' ), network_admin_url( 'users.php?page=bp-profile-setup' ) ); ?></p>
+		<p><?php printf( __( 'Components, Pages, Settings, and Forums, have been moved to <a href="%s">Settings &gt; BuddyPress</a>. Profile Fields has been moved into the <a href="%s">Users</a> menu.', 'buddpress' ), $settings_url, network_admin_url( 'users.php?page=bp-profile-setup' ) ); ?></p>
 	</div>
 <?php
 }
diff --git bp-core/bp-core-functions.php bp-core/bp-core-functions.php
index 378715a..1e6237c 100644
--- bp-core/bp-core-functions.php
+++ bp-core/bp-core-functions.php
@@ -339,15 +339,16 @@ function bp_core_add_admin_menu() {
  		return;
 
 	$hooks = array();
+ 	$page  = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
 
 	// Changed in BP 1.6 . See bp_core_admin_backpat_menu()
 	$hooks[] = add_menu_page( __( 'BuddyPress', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_backpat_menu', '' );
 	$hooks[] = add_submenu_page( 'bp-general-settings', __( 'BuddyPress Help', 'buddypress' ), __( 'Help', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_backpat_page' );
 
 	// Add the option pages
-	$hooks[] = add_options_page( __( 'BuddyPress Components', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-config', 'bp_core_admin_component_setup' );
-	$hooks[] = add_options_page( __( 'BuddyPress Pages', 'buddypress' ),      __( 'BuddyPress Pages', 'buddypress' ),      'manage_options', 'bp-page-settings',  'bp_core_admin_page_setup'      );
-	$hooks[] = add_options_page( __( 'BuddyPress Settings', 'buddypress' ),   __( 'BuddyPress Settings', 'buddypress' ),   'manage_options', 'bp-settings',       'bp_core_admin_settings'        );
+	$hooks[] = add_submenu_page( $page, __( 'BuddyPress Components', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-config', 'bp_core_admin_component_setup' );
+	$hooks[] = add_submenu_page( $page, __( 'BuddyPress Pages', 'buddypress' ),      __( 'BuddyPress Pages', 'buddypress' ),      'manage_options', 'bp-page-settings',  'bp_core_admin_page_setup'      );
+	$hooks[] = add_submenu_page( $page, __( 'BuddyPress Settings', 'buddypress' ),   __( 'BuddyPress Settings', 'buddypress' ),   'manage_options', 'bp-settings',       'bp_core_admin_settings'        );
 
 	foreach( $hooks as $hook ) {
 		// Add a hook for common BP admin CSS/JS scripts