Index: bp-core/admin/bp-core-functions.php
===================================================================
--- bp-core/admin/bp-core-functions.php	(revision 7564)
+++ bp-core/admin/bp-core-functions.php	(working copy)
@@ -708,9 +708,7 @@
 		<h4><?php _e( 'Logged-In', 'buddypress' ) ?></h4>
 		<p><?php _e( '<em>Logged-In</em> links are relative to the current user, and are not visible to visitors who are not logged in.', 'buddypress' ) ?></p>
 
-		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-loggedin" class="tabs-panel <?php
-			echo ( 'loggedin' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
-		?>">
+		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-loggedin" class="tabs-panel tabs-panel-active">
 			<ul id="buddypress-menu-checklist-loggedin" class="categorychecklist form-no-clear">
 				<?php echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $tabs['loggedin']['pages'] ), 0, (object) $args );?>
 			</ul>
@@ -719,8 +717,7 @@
 		<h4><?php _e( 'Logged-Out', 'buddypress' ) ?></h4>
 		<p><?php _e( '<em>Logged-Out</em> links are not visible to users who are logged in.', 'buddypress' ) ?></p>
 
-		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-loggedout" class="tabs-panel <?php
-		?>">
+		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-loggedout" class="tabs-panel tabs-panel-active">
 			<ul id="buddypress-menu-checklist-loggedout" class="categorychecklist form-no-clear">
 				<?php echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $tabs['loggedout']['pages'] ), 0, (object) $args );?>
 			</ul>
Index: bp-core/bp-core-functions.php
===================================================================
--- bp-core/bp-core-functions.php	(revision 7564)
+++ bp-core/bp-core-functions.php	(working copy)
@@ -1618,8 +1618,8 @@
 function bp_nav_menu_get_loggedin_pages() {
 
 	// Try to catch the cached version first
-	if ( ! empty( buddypress()->wp_nav_menu_items ) ) {
-		return buddypress()->wp_nav_menu_items;
+	if ( ! empty( buddypress()->wp_nav_menu_items->loggedin ) ) {
+		return buddypress()->wp_nav_menu_items->loggedin;
 	}
 
 	// Pull up a list of items registered in BP's top-level nav array