Index: bp-core.php
===================================================================
--- bp-core.php	(revision 2789)
+++ bp-core.php	(working copy)
@@ -64,6 +64,14 @@
 if ( !defined( 'BP_SEARCH_SLUG' ) )
 	define( 'BP_SEARCH_SLUG', 'search' );
 
+/* Define the slug for the login page, if the user omits the .php */
+if ( !defined( 'BP_LOGIN1_SLUG' ) )
+	define( 'BP_LOGIN1_SLUG', 'wp-login' );
+
+/* Define the slug for the login page */
+if ( !defined( 'BP_LOGIN_SLUG' ) )
+	define( 'BP_LOGIN_SLUG', BP_LOGIN1_SLUG.'.php' );
+
 /* Register BuddyPress themes contained within the bp-theme folder */
 if ( function_exists( 'register_theme_directory') )
 	register_theme_directory( WP_PLUGIN_DIR . '/buddypress/bp-themes' );
@@ -198,6 +206,8 @@
 	bp_core_add_root_component( BP_REGISTER_SLUG );
 	bp_core_add_root_component( BP_ACTIVATION_SLUG );
 	bp_core_add_root_component( BP_SEARCH_SLUG );
+	bp_core_add_root_component( BP_LOGIN_SLUG );
+	bp_core_add_root_component( BP_LOGIN1_SLUG );
 }
 add_action( 'plugins_loaded', 'bp_core_setup_root_uris', 2 );
 
