Index: bp-core/admin/bp-core-functions.php
===================================================================
--- bp-core/admin/bp-core-functions.php	(revision 6104)
+++ bp-core/admin/bp-core-functions.php	(working copy)
@@ -365,8 +365,8 @@ function bp_core_admin_tabs( $active_tab = '' ) {
 		)
 	);
 
-	// If forums component is active and bbPress 1.x is in use add additional tab
-	if ( bp_is_active( 'forums' ) && bp_forums_is_repair() ) {
+	// If forums component is active, add additional tab
+	if ( bp_is_active( 'forums' ) ) {
 		$tabs['3'] = array(
 			'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bb-forums-setup'  ), 'admin.php' ) ),
 			'name' => __( 'Forums', 'buddypress' )
Index: bp-core/admin/bp-core-update.php
===================================================================
--- bp-core/admin/bp-core-update.php	(revision 6104)
+++ bp-core/admin/bp-core-update.php	(working copy)
@@ -542,8 +542,8 @@ class BP_Core_Setup_Wizard {
 		$current_theme = wp_get_theme();
 		$screenshot    = '';
 
-		if ( !empty( $installed_themes[$current_theme]['Screenshot'] ) ) {
-			$screenshot = trailingslashit( get_stylesheet_directory_uri() ) . $installed_themes[$current_theme]['Screenshot'];
+		if ( !empty( $installed_themes[$current_theme->stylesheet]['Screenshot'] ) ) {
+			$screenshot = trailingslashit( get_stylesheet_directory_uri() ) . $installed_themes[$current_theme->stylesheet]['Screenshot'];
 		} ?>
 
 		<script type="text/javascript">
Index: bp-forums/bp-forums-admin.php
===================================================================
--- bp-forums/bp-forums-admin.php	(revision 6104)
+++ bp-forums/bp-forums-admin.php	(working copy)
@@ -1,57 +1,86 @@
 <?php
-
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
 
-/** UI ************************************************************************/
-
 function bp_forums_add_admin_menu() {
+	global $bp;
 
-	if ( ! bp_current_user_can( 'bp_moderate' ) )
-		return;
+	if ( !is_super_admin() )
+		return false;
 
-	if ( ! bp_forums_is_repair() )
-		return;
+	$page  = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
 
-	// Add the option pages
-	$page = bp_core_do_network_admin()  ? 'settings.php' : 'options-general.php';
-	$hook = add_submenu_page( $page, __( 'BuddyPress Forums', 'buddypress' ), __( 'BuddyPress Forums', 'buddypress' ), 'manage_options', 'bb-forums-setup', 'bp_forums_bbpress_admin' );
+	// Add the administration tab under the "Site Admin" tab for site administrators
+	$hook = add_submenu_page( $page, __( 'Forums', 'buddypress' ), __( 'Forums', 'buddypress' ), 'manage_options', 'bb-forums-setup', "bp_forums_bbpress_admin" );
 
-	// Fudge the highlighted subnav item when on a BuddyPress admin page
+	// Fudge the highlighted subnav item when on the BuddyPress Forums admin page
 	add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
 }
 add_action( bp_core_admin_hook(), 'bp_forums_add_admin_menu' );
 
 function bp_forums_bbpress_admin() {
-?>
+	global $bp;
 
-	<div class="wrap">
+	$action = bp_get_admin_url( 'admin.php?page=bb-forums-setup&reinstall=1' ); ?>
 
+	<div class="wrap">
 		<?php screen_icon( 'buddypress' ); ?>
 
 		<h2 class="nav-tab-wrapper"><?php bp_core_admin_tabs( __( 'Forums', 'buddypress' ) ); ?></h2>
 
-		<h3><?php _e( 'Forum Repair', 'buddypress' ); ?></h3>
+		<?php if ( isset( $_POST['submit'] ) ) : ?>
 
-		<?php if ( bp_forums_is_repair() ) : ?>
+			<div id="message" class="updated fade">
+				<p><?php _e( 'Settings Saved.', 'buddypress' ) ?></p>
+			</div>
 
-			<p><?php printf( __( 'The following configuration was successfully saved to: %s', 'buddypress' ), bp_get_option( 'bb-config-location' ) );?></p>
+		<?php endif; ?>
 
-			<div id="template">
-				<textarea cols="70" rows="25" name="bb-config" id="bb-config"><?php echo bp_forums_bbpress_install( bp_get_option( 'bb-config-location' ) ); ?></textarea>
-			</div>
+		<?php
 
-		<?php elseif ( bp_forums_is_migrate() ) : ?>
+		if ( isset( $_REQUEST['reinstall'] ) || !bp_forums_is_installed_correctly() ) :
 
-			<?php
-				add_thickbox();
-				wp_enqueue_script( 'plugin-install' );
-				wp_admin_css( 'plugin-install' );
-			?>
+			// Delete the bb-config.php location option
+			bp_delete_option( 'bb-config-location' );
+			bp_forums_bbpress_install_wizard();
+
+		else : ?>
+
+			<div style="width: 45%; float: left; margin-top: 20px;">
+				<h3><?php _e( '(Installed)', 'buddypress' ); ?> <?php _e( 'Forums for Groups', 'buddypress' ) ?></h3>
 
-			<a class="button thickbox button-primary" href="<?php bp_admin_url( add_query_arg( array( 'tab' => 'plugin-information', 'plugin' => 'bbpress', 'TB_iframe' => 'true', 'width' => '640', 'height' => '500' ), 'plugin-install.php' ) ); ?>"><?php _e( 'Install Site Wide Forums', 'buddypress' ) ?></a> &nbsp;
+				<p><?php _e( 'Give each individual group its own discussion forum. Choose this if you\'d like to keep your members\' conversations separated into distinct areas.' , 'buddypress' ); ?></p>
+				<p class="description"><?php _e( 'You may use an existing bbPress installation if you have one.', 'buddypress' ); ?></p>
 
-		<?php else : ?>
+				<h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4>
+				<ul class="description" style="list-style: square; margin-left: 30px;">
+					<li><?php _e( 'Group Integration',           'buddypress' ); ?></p></li>
+					<li><?php _e( 'Member Profile Integration',  'buddypress' ); ?></p></li>
+					<li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li>
+					<li><?php _e( '@ Mention Integration',       'buddypress' ); ?></p></li>
+				</ul>
+
+				<div>
+					<a class="button button-primary" href="<?php echo $action ?>"><?php _e( 'Uninstall Group Forums', 'buddypress' ) ?></a> &nbsp;
+				</div>
+			</div>
+
+			<div style="width: 45%; float: left; margin: 20px 0 20px 20px; padding: 0 20px 20px 20px; border: 1px solid #ddd; background-color: #fff;">
+				<h3><?php _e( 'New! Site Wide Forums', 'buddypress' ) ?></h3>
+				<p><?php _e( 'Your site will have central forums that are not isolated to any specific group. Choose this if you\'d like to have a central forum area for your members.', 'buddypress' ) ?></p>
+				<p class="description"><?php _e( 'You may activate both Group and Site Wide forums, but this may create a poor experience for your members.', 'buddypress' ) ?></p>
+
+				<h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4>
+				<ul class="description" style="list-style: square; margin-left: 30px;">
+					<li><?php _e( 'Central Discussion Area',     'buddypress' ); ?></p></li>
+					<li><?php _e( 'Forum Plugins Available',     'buddypress' ); ?></p></li>
+					<li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li>
+					<li><?php _e( '@ Mention Integration',       'buddypress' ); ?></p></li>
+				</ul>
+				<div>
+					<a class="button thickbox button-primary" href="<?php bp_admin_url( add_query_arg( array( 'tab' => 'plugin-information', 'plugin' => 'bbpress', 'TB_iframe' => 'true', 'width' => '640', 'height' => '500' ), 'plugin-install.php' ) ); ?>"><?php _e( 'Install Site Wide Forums', 'buddypress' ) ?></a> &nbsp;
+				</div>
+			</div>
 
 		<?php endif; ?>
 
@@ -59,80 +88,155 @@ function bp_forums_bbpress_admin() {
 <?php
 }
 
-/** _is_ **********************************************************************/
+function bp_forums_bbpress_install_wizard() {
+	$post_url = network_admin_url( 'admin.php?page=bb-forums-setup' );
+
+	$step = isset( $_REQUEST['step'] ) ? $_REQUEST['step'] : '';
+
+	switch( $step ) {
+		case 'existing':
+			if ( isset( $_REQUEST['doinstall'] ) && ( 1 == (int) $_REQUEST['doinstall'] ) ) {
+				if ( !bp_forums_configure_existing_install() ) {
+					_e( 'The bb-config.php file was not found at that location, please try again.', 'buddypress' );
+				} else {
+					?>
+					<h3><?php _e( 'Forums were set up correctly using your existing bbPress install!', 'buddypress' ) ?></h3>
+					<p><?php _e( 'BuddyPress will now use its internal copy of bbPress to run the forums on your site. If you wish, you can remove your old bbPress installation files, as long as you keep the bb-config.php file in the same location.', 'buddypress' ) ?></p><?php
+				}
+			} else { ?>
+
+					<form action="" method="post">
+						<h3><?php _e( 'Existing bbPress Installation', 'buddypress' ) ?></h3>
+						<p><?php _e( "BuddyPress can make use of your existing bbPress install. Just provide the location of your <code>bb-config.php</code> file, and BuddyPress will do the rest.", 'buddypress' ) ?></p>
+						<p><label><code>bb-config.php</code> file location:</label><br /><input style="width: 50%" type="text" name="bbconfigloc" id="bbconfigloc" value="<?php echo str_replace( 'buddypress', '', $_SERVER['DOCUMENT_ROOT'] ) ?>" /></p>
+						<p><input type="submit" class="button-primary" value="<?php _e( 'Complete Installation', 'buddypress' ) ?>" /></p>
+						<input type="hidden" name="step" value="existing" />
+						<input type="hidden" name="doinstall" value="1" />
+						<?php wp_nonce_field( 'bp_forums_existing_install_init' ) ?>
+					</form>
+
+				<?php
+			}
+		break;
 
-/**
- * Trying to repair a bbPress 1.x installation
- *
- * @since BuddyPress (1.6)
- * @return boolean True if option exists, false if not
- */
-function bp_forums_is_repair() {
+		case 'new':
+			if ( isset( $_REQUEST['doinstall'] ) && 1 == (int)$_REQUEST['doinstall'] ) {
+				$result = bp_forums_bbpress_install();
 
-	// Bail if bbPress 1.x was never installed
-	if ( isset( $_REQUEST['repair'] ) && bp_forums_is_installed_correctly() )
-		return true;
+				switch ( $result ) {
+					case 1:
+						_e( '<p>All done! Configuration settings have been saved to the file <code>bb-config.php</code> in the root of your WordPress install.</p>', 'buddypress' );
+						break;
+					default:
+						// Just write the contents to screen
+						_e( '<p>A configuration file could not be created. No problem, but you will need to save the text shown below into a file named <code>bb-config.php</code> in the root directory of your WordPress installation before you can start using the forum functionality.</p>', 'buddypress' ); ?>
 
-	return false;
-}
+						<textarea style="display:block; margin-top: 30px; width: 80%;" rows="50"><?php echo htmlspecialchars( $result ); ?></textarea>
 
-/**
- * bbPress 1.x is installed, and we're moving to bbPress 2.x
- *
- * @since BuddyPress (1.6)
- * @return boolean True if option exists, false if not
- */
-function bp_forums_is_migrate() {
+					<?php
+						break;
+				}
+			} else { ?>
 
-	// Bail if bbPress 1.x was never installed
-	if ( isset( $_REQUEST['migrate'] ) && bp_forums_is_installed_correctly() )
-		return true;
+				<h3><?php _e( 'New bbPress Installation', 'buddypress' ) ?></h3>
+				<p><?php _e( "You've decided to set up a new installation of bbPress for forum management in BuddyPress. This is very simple and is usually just a one click
+				process. When you're ready, hit the link below.", 'buddypress' ) ?></p>
+				<p><a class="button-primary" href="<?php echo wp_nonce_url( $post_url . '&step=new&doinstall=1', 'bp_forums_new_install_init' ) ?>"><?php _e( 'Complete Installation', 'buddypress' ) ?></a></p>
 
-	return false;
-}
+				<?php
+			}
+		break;
 
-/**
- * bbPress was never installed before, and bbPress 2.x is not installed yet
- *
- * @since BuddyPress (1.6)
- * @return boolean True if option exists, false if not
- */
-function bp_forums_is_fresh_install() {
+		default:
+			if ( !file_exists( BP_PLUGIN_DIR . '/bp-forums/bbpress/' ) ) { ?>
 
-	// Bail if bbPress 1.x was never installed
-	if ( isset( $_REQUEST['install'] ) && ! bp_forums_is_installed_correctly() )
-		return true;
+				<div id="message" class="error">
+					<p><?php printf( __( 'bbPress files were not found. To install the forums component you must download a copy of bbPress and make sure it is in the folder: "%s"', 'buddypress' ), 'wp-content/plugins/buddypress/bp-forums/bbpress/' ) ?></p>
+				</div>
 
-	return false;
-}
+			<?php } else {
 
-/**
- * Both bbPress 1.x and bbPress 2.x are installed
- *
- * @since BuddyPress (1.6)
- * @return boolean True if option exists, false if not
- */
-function bp_forums_is_hybrid_install() {
+				// Include the plugin install
 
-	// Bail if bbPress 1.x was never installed
-	if ( isset( $_REQUEST['install'] ) && bp_forums_is_bbpress_active && bp_forums_is_installed_correctly() )
-		return true;
+				add_thickbox();
+				wp_enqueue_script( 'plugin-install' );
+				wp_admin_css( 'plugin-install' );
+			?>
 
-	return false;
+				<div style="width: 45%; float: left;  margin-top: 20px;">
+					<h3><?php _e( 'Forums for Groups', 'buddypress' ) ?></h3>
+
+					<p><?php _e( 'Give each individual group its own discussion forum. Choose this if you\'d like to keep your members\' conversations separated into distinct areas.' , 'buddypress' ); ?></p>
+					<p class="description"><?php _e( 'You may use an existing bbPress installation if you have one.', 'buddypress' ); ?></p>
+
+					<h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4>
+					<ul class="description" style="list-style: square; margin-left: 30px;">
+						<li><?php _e( 'Group Integration',           'buddypress' ); ?></p></li>
+						<li><?php _e( 'Member Profile Integration',  'buddypress' ); ?></p></li>
+						<li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li>
+						<li><?php _e( '@ Mention Integration',       'buddypress' ); ?></p></li>
+					</ul>
+
+					<div>
+						<a class="button button-primary" href="<?php echo $post_url . '&step=new' ?>"><?php _e( 'Install Group Forums', 'buddypress' ) ?></a> &nbsp;
+						<a class="button" href="<?php echo $post_url . '&step=existing' ?>"><?php _e( 'Use Existing Installation', 'buddypress' ) ?></a>
+					</div>
+				</div>
+
+				<div style="width: 45%; float: left; margin: 20px 0 20px 20px; padding: 0 20px 20px 20px; border: 1px solid #ddd; background-color: #fff;">
+					<h3><?php _e( 'New! Site Wide Forums', 'buddypress' ) ?></h3>
+					<p><?php _e( 'Your site will have central forums that are not isolated to any specific group. Choose this if you\'d like to have a central forum area for your members.', 'buddypress' ) ?></p>
+					<p class="description"><?php _e( 'You may activate both Group and Site Wide forums, but this may create a poor experience for your members.', 'buddypress' ) ?></p>
+
+					<h4 style="margin-bottom: 10px;"><?php _e( 'Features', 'buddypress' ); ?></h4>
+					<ul class="description" style="list-style: square; margin-left: 30px;">
+						<li><?php _e( 'Central Discussion Area',     'buddypress' ); ?></p></li>
+						<li><?php _e( 'Forum Plugins Available',     'buddypress' ); ?></p></li>
+						<li><?php _e( 'Activity Stream Integration', 'buddypress' ); ?></p></li>
+						<li><?php _e( '@ Mention Integration',       'buddypress' ); ?></p></li>
+					</ul>
+					<div>
+						<a class="button thickbox button-primary" href="<?php bp_admin_url( add_query_arg( array( 'tab' => 'plugin-information', 'plugin' => 'bbpress', 'TB_iframe' => 'true', 'width' => '640', 'height' => '500' ), 'plugin-install.php' ) ); ?>"><?php _e( 'Install Site Wide Forums', 'buddypress' ) ?></a> &nbsp;
+					</div>
+				</div>
+
+			<?php }
+		break;
+	}
 }
 
-/** Config ********************************************************************/
+function bp_forums_configure_existing_install() {
+	global $wpdb, $bbdb;
+
+	check_admin_referer( 'bp_forums_existing_install_init' );
+
+	// Sanitize $_REQUEST['bbconfigloc']
+	$_REQUEST['bbconfigloc'] = apply_filters( 'bp_forums_bbconfig_location', $_REQUEST['bbconfigloc'] );
+
+	if ( false === strpos( $_REQUEST['bbconfigloc'], 'bb-config.php' ) ) {
+		if ( '/' != substr( $_REQUEST['bbconfigloc'], -1, 1 ) )
+			$_REQUEST['bbconfigloc'] .= '/';
+
+		$_REQUEST['bbconfigloc'] .= 'bb-config.php';
+	}
 
-function bp_forums_bbpress_install( $location = '' ) {
-	global $wpdb, $bp;
+	bp_update_option( 'bb-config-location', $_REQUEST['bbconfigloc'] );
 
-	if ( empty( $location ) )
-		$location = ABSPATH . 'bb-config.php';
+	if ( !file_exists( $_REQUEST['bbconfigloc'] ) )
+		return false;
+
+	return true;
+}
+
+function bp_forums_bbpress_install() {
+	global $wpdb, $bbdb, $bp;
+
+	check_admin_referer( 'bp_forums_new_install_init' );
 
 	// Create the bb-config.php file
 	$initial_write = bp_forums_bbpress_write(
 		BP_PLUGIN_DIR . '/bp-forums/bbpress/bb-config-sample.php',
-		$location,
+		ABSPATH . 'bb-config.php',
 		array(
 			"define( 'BBDB_NAME',"  => array( "'bbpress'",                     	"'" . DB_NAME . "'" ),
 			"define( 'BBDB_USER',"  => array( "'username'",                    	"'" . DB_USER . "'" ),
@@ -150,67 +254,57 @@ function bp_forums_bbpress_install( $location = '' ) {
 	);
 
 	// Add the custom user and usermeta entries to the config file
-	if ( $initial_write == 1 ) {
-		$file = file_get_contents( $location );
-	} else {
+	if ( $initial_write == 1 )
+		$file = file_get_contents( ABSPATH . 'bb-config.php' );
+	else
 		$file = &$initial_write;
-	}
 
 	$file = trim( $file );
-	if ( '?>' == substr( $file, -2, 2 ) ) {
+	if ( '?>' == substr( $file, -2, 2 ) )
 		$file = substr( $file, 0, -2 );
-	}
 
 	$file .= "\n" .   '$bb->custom_user_table = \'' . $wpdb->users . '\';';
 	$file .= "\n" .   '$bb->custom_user_meta_table = \'' . $wpdb->usermeta . '\';';
-	$file .= "\n\n" . '$bb->uri = \'' . BP_PLUGIN_URL . 'bp-forums/bbpress/\';';
+	$file .= "\n\n" . '$bb->uri = \'' . BP_PLUGIN_URL . '/bp-forums/bbpress/\';';
 	$file .= "\n" .   '$bb->name = \'' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . ' ' . __( 'Forums', 'buddypress' ) . '\';';
 
-	if ( is_multisite() ) {
+	if ( is_multisite() )
 		$file .= "\n" .   '$bb->wordpress_mu_primary_blog_id = ' . bp_get_root_blog_id() . ';';
-	}
 
-	if ( defined( 'AUTH_SALT' ) ) {
+	if ( defined( 'AUTH_SALT' ) )
 		$file .= "\n\n" . 'define(\'BB_AUTH_SALT\', \'' . addslashes( AUTH_SALT ) . '\');';
-	}
 
-	if ( defined( 'LOGGED_IN_SALT' ) ) {
+	if ( defined( 'LOGGED_IN_SALT' ) )
 		$file .= "\n" .   'define(\'BB_LOGGED_IN_SALT\', \'' . addslashes( LOGGED_IN_SALT ) . '\');';
-	}
 
-	if ( defined( 'SECURE_AUTH_SALT' ) ) {
+	if ( defined( 'SECURE_AUTH_SALT' ) )
 		$file .= "\n" .   'define(\'BB_SECURE_AUTH_SALT\', \'' . addslashes( SECURE_AUTH_SALT ) . '\');';
-	}
 
 	$file .= "\n\n" . 'define(\'WP_AUTH_COOKIE_VERSION\', 2);';
 	$file .= "\n\n" . '?>';
 
 	if ( $initial_write == 1 ) {
-		$file_handle = fopen( $location, 'w' );
+		$file_handle = fopen( ABSPATH . 'bb-config.php', 'w' );
 		fwrite( $file_handle, $file );
 		fclose( $file_handle );
 	} else {
 		$initial_write = $file;
 	}
 
-	bp_update_option( 'bb-config-location', $location );
-
-	return $file;
+	bp_update_option( 'bb-config-location', ABSPATH . 'bb-config.php' );
+	return $initial_write;
 }
 
 function bp_forums_bbpress_write( $file_source, $file_target, $alterations ) {
 
-	if ( empty( $file_source ) || !file_exists( $file_source ) || !is_file( $file_source ) ) {
+	if ( !$file_source || !file_exists( $file_source ) || !is_file( $file_source ) )
 		return -1;
-	}
 
-	if ( empty( $file_target ) ) {
+	if ( !$file_target )
 		$file_target = $file_source;
-	}
 
-	if ( empty( $alterations ) || !is_array( $alterations ) ) {
+	if ( !$alterations || !is_array( $alterations ) )
 		return -2;
-	}
 
 	// Get the existing lines in the file
 	$lines = file( $file_source );
@@ -219,7 +313,7 @@ function bp_forums_bbpress_write( $file_source, $file_target, $alterations ) {
 	$modified_lines = array();
 
 	// Loop through the lines and modify them
-	foreach ( (array) $lines as $line ) {
+	foreach ( (array)$lines as $line ) {
 		if ( isset( $alterations[substr( $line, 0, 20 )] ) ) {
 			$alteration = $alterations[substr( $line, 0, 20 )];
 			$modified_lines[] = str_replace( $alteration[0], $alteration[1], $line );
@@ -245,18 +339,18 @@ function bp_forums_bbpress_write( $file_source, $file_target, $alterations ) {
 		}
 	}
 
-	if ( empty( $writable ) ) {
+	if ( empty( $writable ) )
 		return trim( join( null, $modified_lines ) );
-	}
 
 	// Open the file for writing - rewrites the whole file
 	$file_handle = fopen( $file_target, 'w' );
 
 	// Write lines one by one to avoid OS specific newline hassles
-	foreach ( (array) $modified_lines as $modified_line ) {
-		if ( false !== strpos( $modified_line, '?>' ) ) {
+	foreach ( (array)$modified_lines as $modified_line ) {
+		if ( strlen( $modified_line ) - 2 === strrpos( $modified_line, '?>' ) ) {
 			$modified_line = '?>';
 		}
+
 		fwrite( $file_handle, $modified_line );
 		if ( $modified_line == '?>' ) {
 			break;
Index: bp-forums/bp-forums-functions.php
===================================================================
--- bp-forums/bp-forums-functions.php	(revision 6104)
+++ bp-forums/bp-forums-functions.php	(working copy)
@@ -34,7 +34,9 @@ function bp_forums_is_bbpress_active() {
  * @return boolean True if option exists, false if not
  */
 function bp_forums_is_installed_correctly() {
-	if ( bp_get_option(	'bb-config-location' ) )
+	global $bp;
+
+	if ( isset( $bp->forums->bbconfig ) && is_file( $bp->forums->bbconfig ) )
 		return true;
 
 	return false;
@@ -240,8 +242,8 @@ function bp_forums_update_topic( $args = '' ) {
 	$r = wp_parse_args( $args, $defaults );
 	extract( $r, EXTR_SKIP );
 
-	// Check if the user is a spammer 
-	if ( bp_is_user_inactive( bp_loggedin_user_id() ) ) 
+	// Check if the user is a spammer
+	if ( bp_is_user_inactive( bp_loggedin_user_id() ) )
 		return false;
 
 	// bb_insert_topic() will append tags, but not remove them. So we remove all existing tags.
@@ -351,23 +353,23 @@ function bp_forums_total_topic_count() {
  */
 function bp_forums_reply_exists( $text = '', $topic_id = 0, $user_id = 0 ) {
 	$reply_exists = false;
-	
+
 	if ( $text && $topic_id && $user_id ) {
 		do_action( 'bbpress_init' );
-		
+
 		$args = array(
 			'post_author_id' => $user_id,
 			'topic_id'       => $topic_id
 		);
-		
+
 		// BB_Query's post_text parameter does a MATCH, while we need exact matches
 		add_filter( 'get_posts_where', create_function( '$q', 'return $q . " AND p.post_text = \'' . $text . '\'";' ) );
-		
+
 		$query = new BB_Query( 'post', $args );
-		
+
 		$reply_exists = !empty( $query->results );
 	}
-	
+
 	return apply_filters( 'bp_forums_reply_exists', $reply_exists, $text, $topic_id, $user_id );
 }
 
Index: bp-forums/bp-forums-loader.php
===================================================================
--- bp-forums/bp-forums-loader.php	(revision 6104)
+++ bp-forums/bp-forums-loader.php	(working copy)
@@ -47,6 +47,10 @@ class BP_Forums_Component extends BP_Component {
 		if ( !defined( 'BP_FORUMS_SLUG' ) )
 			define( 'BP_FORUMS_SLUG', $this->id );
 
+		// The location of the bbPress stand-alone config file
+		if ( isset( $bp->site_options['bb-config-location'] ) )
+			$this->bbconfig = $bp->site_options['bb-config-location'];
+
 		// All globals for messaging component.
 		// Note that global_tables is included in this array.
 		$globals = array(
Index: bp-themes/bp-default/groups/create.php
===================================================================
--- bp-themes/bp-default/groups/create.php	(revision 6104)
+++ bp-themes/bp-default/groups/create.php	(working copy)
@@ -11,7 +11,7 @@ get_header( 'buddypress' ); ?>
 
 	<div id="content">
 		<div class="padder">
-		
+
 		<?php do_action( 'bp_before_create_group_content_template' ); ?>
 
 		<form action="<?php bp_group_creation_form_action(); ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
@@ -107,15 +107,22 @@ get_header( 'buddypress' ); ?>
 						</label>
 					</div>
 
-					<?php if ( bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() ) : ?>
+					<?php if ( bp_is_active( 'forums' ) ) : ?>
 
 						<h4><?php _e( 'Group Forums', 'buddypress' ); ?></h4>
 
-						<p><?php _e( 'Should this group have a forum?', 'buddypress' ); ?></p>
+						<?php if ( bp_forums_is_installed_correctly() ) : ?>
 
-						<div class="checkbox">
-							<label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php checked( bp_get_new_group_enable_forum(), true, true ); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label>
-						</div>
+							<p><?php _e( 'Should this group have a forum?', 'buddypress' ); ?></p>
+
+							<div class="checkbox">
+								<label><input type="checkbox" name="group-show-forum" id="group-show-forum" value="1"<?php checked( bp_get_new_group_enable_forum(), true, true ); ?> /> <?php _e( 'Enable discussion forum', 'buddypress' ); ?></label>
+							</div>
+						<?php elseif ( is_super_admin() ) : ?>
+
+							<p><?php printf( __( '<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_core_do_network_admin() ? network_admin_url( 'settings.php?page=bb-forums-setup' ) :  admin_url( 'admin.php?page=bb-forums-setup' ) ); ?></p>
+
+						<?php endif; ?>
 
 					<?php endif; ?>
 
@@ -298,7 +305,7 @@ get_header( 'buddypress' ); ?>
 			<?php do_action( 'bp_after_create_group' ); ?>
 
 		</form>
-		
+
 		<?php do_action( 'bp_after_create_group_content_template' ); ?>
 
 		</div><!-- .padder -->