Index: bp-core/bp-core-functions.php
===================================================================
--- bp-core/bp-core-functions.php	(revision 5148)
+++ bp-core/bp-core-functions.php	(working copy)
@@ -401,7 +401,7 @@
 
 	// Activate and Register are special cases. They are not components but they need WP pages.
 	// If user registration is disabled, we can skip this step.
-	if ( isset( $bp->site_options['registration'] ) && ( 'user' == $bp->site_options['registration'] || ( 'all' == $bp->site_options['registration'] ) ) ) {
+	if ( bp_get_signup_allowed() ) {
 		$wp_page_components[] = array(
 			'id'   => 'activate',
 			'name' => __( 'Activate', 'buddypress' )
Index: bp-core/admin/bp-core-admin.php
===================================================================
--- bp-core/admin/bp-core-admin.php	(revision 5148)
+++ bp-core/admin/bp-core-admin.php	(working copy)
@@ -570,8 +570,8 @@
 
 	// Static pages
 	$static_pages = array(
-		'register' => __( 'Sign-up',    'buddypress' ),
-		'activate' => __( 'Activation', 'buddypress' ),
+		'register' => __( 'Register', 'buddypress' ),
+		'activate' => __( 'Activate', 'buddypress' ),
 	); ?>
 
 	<h3><?php _e( 'Registration', 'buddypress' ); ?></h3>