Index: src/bp-core/bp-core-buddybar.php
===================================================================
--- src/bp-core/bp-core-buddybar.php
+++ src/bp-core/bp-core-buddybar.php
@@ -342,6 +342,19 @@
 		// No subnav item has been requested in the URL, so set a new nav default.
 		if ( empty( $unfiltered_action ) ) {
 			if ( ! bp_is_current_action( $r['subnav_slug'] ) ) {
+				/*
+				 * If the screen function isn't available, attempt to find it.
+				 *
+				 * This is due to our conditional-loading code since v3.0.0.
+				 */
+				if ( ! is_callable( $r['screen_function'] ) ) {
+					$file = $bp->core->path . 'bp-' . $parent_nav->css_id . '/screens/' . $r['subnav_slug'] . '.php';
+					// Found the file, so require it.
+					if ( file_exists( $file ) ) {
+						require_once $file;
+					}
+				}
+
 				if ( is_callable( $r['screen_function'] ) ) {
 					add_action( 'bp_screens', $r['screen_function'], 3 );
 				}
Index: src/bp-settings/classes/class-bp-settings-component.php
===================================================================
--- src/bp-settings/classes/class-bp-settings-component.php
+++ src/bp-settings/classes/class-bp-settings-component.php
@@ -144,7 +144,8 @@
 			'position'                => 100,
 			'show_for_displayed_user' => $access,
 			'screen_function'         => 'bp_settings_screen_general',
-			'default_subnav_slug'     => 'general'
+			'default_subnav_slug'     => 'general',
+			'item_css_id'             => $this->id
 		);
 
 		// Add General Settings nav item.