--- buddypress/bp-members/bp-members-functions.php.orig	2013-01-24 21:27:45.000000000 +0100
+++ buddypress/bp-members/bp-members-functions.php	2013-02-07 14:48:37.000000000 +0100
@@ -1359,13 +1359,19 @@
 	if ( is_admin() || is_network_admin() )
 		return;
 
-	// Not at the WP core signup page and action is not register
-	if ( ! empty( $_SERVER['SCRIPT_NAME'] ) && false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php' ) && ( 'register' != $action ) )
-		return;
+	// Is it WP core signup page?
+	if ( empty( $_SERVER['SCRIPT_NAME'] ) ) {
+		$is_wp_signup = false;
+	} else {	
+		$is_wp_signup = ( false !== strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php' ) );
+	}
 
-	// Redirect to sign-up page
-	if ( locate_template( array( 'registration/register.php' ), false ) || locate_template( array( 'register.php' ), false ) )
-		bp_core_redirect( bp_get_signup_page() );
+	// Only redirect at the WP core signup page or when action is register
+	if ( ( $is_wp_signup ) || ( 'register' === $action ) ) {
+		// Redirect to buddypress sign-up page
+		if ( locate_template( array( 'registration/register.php' ), false ) || locate_template( array( 'register.php' ), false ) )
+			bp_core_redirect( bp_get_signup_page() );
+	}
 }
 add_action( 'bp_init', 'bp_core_wpsignup_redirect' );