Index: bp-core/bp-core-templatetags.php
===================================================================
--- bp-core/bp-core-templatetags.php	(revision 3542)
+++ bp-core/bp-core-templatetags.php	(working copy)
@@ -1741,7 +1741,7 @@
 function bp_is_user_groups() {
 	global $bp;
 
-	if ( $bp->groups->slug == $bp->current_component )
+	if ( $bp->groups->mid_slug == $bp->current_component )
 		return true;
 
 	return false;
Index: bp-core/bp-core-catchuri.php
===================================================================
--- bp-core/bp-core-catchuri.php	(revision 3542)
+++ bp-core/bp-core-catchuri.php	(working copy)
@@ -139,7 +139,7 @@
 
 		unset( $uri_chunks );
 	}
-	
+
 	// Search doesn't have an associated page, so we check for it separately
 	if ( !empty( $bp_uri[0] ) && BP_SEARCH_SLUG == $bp_uri[0] )
 		$matches[] = 1;
Index: bp-groups.php
===================================================================
--- bp-groups.php	(revision 3542)
+++ bp-groups.php	(working copy)
@@ -9,11 +9,20 @@
 
 	if ( !defined( 'BP_GROUPS_SLUG' ) )
 		define ( 'BP_GROUPS_SLUG', $bp->pages->groups->slug );
+	
+	if ( !defined( 'BP_GROUPS_MID_SLUG' ) ) {
+	        if ( strpos( BP_GROUPS_SLUG, '/' ) ) {
+	                define( 'BP_GROUPS_MID_SLUG', 'groups' );
+	        } else {
+	                define( 'BP_GROUPS_MID_SLUG', BP_GROUPS_SLUG );
+	        }
+	}
 
 	/* For internal identification */
 	$bp->groups->id = 'groups';
 	$bp->groups->name = $bp->pages->groups->name;
 	$bp->groups->slug = BP_GROUPS_SLUG;
+	$bp->groups->mid_slug = BP_GROUPS_MID_SLUG;
 
 	$bp->groups->table_name           = $bp->table_prefix . 'bp_groups';
 	$bp->groups->table_name_members   = $bp->table_prefix . 'bp_groups_members';
@@ -71,13 +80,13 @@
 	}
 
 	/* Add 'Groups' to the main navigation */
-	bp_core_new_nav_item( array( 'name' => sprintf( __( 'Groups <span>(%d)</span>', 'buddypress' ), groups_total_groups_for_user() ), 'slug' => $bp->groups->name, 'position' => 70, 'screen_function' => 'groups_screen_my_groups', 'default_subnav_slug' => 'my-groups', 'item_css_id' => $bp->groups->id ) );
+	bp_core_new_nav_item( array( 'name' => sprintf( __( 'Groups <span>(%d)</span>', 'buddypress' ), groups_total_groups_for_user() ), 'slug' => $bp->groups->mid_slug, 'position' => 70, 'screen_function' => 'groups_screen_my_groups', 'default_subnav_slug' => 'my-groups', 'item_css_id' => $bp->groups->id ) );
 
-	$groups_link = $bp->loggedin_user->domain . $bp->groups->name . '/';
+	$groups_link = $bp->loggedin_user->domain . $bp->groups->mid_slug . '/';
 
 	/* Add the subnav items to the groups nav item */
-	bp_core_new_subnav_item( array( 'name' => __( 'My Groups', 'buddypress' ), 'slug' => 'my-groups', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->name, 'screen_function' => 'groups_screen_my_groups', 'position' => 10, 'item_css_id' => 'groups-my-groups' ) );
-	bp_core_new_subnav_item( array( 'name' => __( 'Invites', 'buddypress' ), 'slug' => 'invites', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->name, 'screen_function' => 'groups_screen_group_invites', 'position' => 30, 'user_has_access' => bp_is_my_profile() ) );
+	bp_core_new_subnav_item( array( 'name' => __( 'My Groups', 'buddypress' ), 'slug' => 'my-groups', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->mid_slug, 'screen_function' => 'groups_screen_my_groups', 'position' => 10, 'item_css_id' => 'groups-my-groups' ) );
+	bp_core_new_subnav_item( array( 'name' => __( 'Invites', 'buddypress' ), 'slug' => 'invites', 'parent_url' => $groups_link, 'parent_slug' => $bp->groups->mid_slug, 'screen_function' => 'groups_screen_group_invites', 'position' => 30, 'user_has_access' => bp_is_my_profile() ) );
 
 	if ( $bp->current_component == $bp->groups->slug ) {