Index: bp-themes/bp-default/_inc/ajax.php
===================================================================
--- bp-themes/bp-default/_inc/ajax.php	(revision 3383)
+++ bp-themes/bp-default/_inc/ajax.php	(working copy)
@@ -53,7 +53,8 @@
 	if ( !empty( $_POST['page'] ) && '-1' != $_POST['page'] )
 		$qs[] = 'page=' . $_POST['page'];
 
-	if ( !empty( $_POST['search_terms'] ) && __( 'Search anything...', 'buddypress' ) != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
+    $object_search_text = bp_get_search_default_text( $object );
+	if ( !empty( $_POST['search_terms'] ) && $object_search_text != $_POST['search_terms'] && 'false' != $_POST['search_terms'] && 'undefined' != $_POST['search_terms'] )
 		$qs[] = 'search_terms=' . $_POST['search_terms'];
 
 	/* Now pass the querystring to override default values. */
Index: bp-core/bp-core-templatetags.php
===================================================================
--- bp-core/bp-core-templatetags.php	(revision 3383)
+++ bp-core/bp-core-templatetags.php	(working copy)
@@ -450,13 +450,13 @@
 function bp_directory_members_search_form() {
 	global $bp;
 
-	$search_value = __( 'Search anything...', 'buddypress' );
-	if ( !empty( $_GET['s'] ) )
-	 	$search_value = $_GET['s'];
-
+	$default_search_value = bp_get_search_default_text();
+	
+	$search_value = !empty( $_REQUEST['s'] ) ? $_REQUEST['s'] : $default_search_value;
+	
 	?>
 	<form action="" method="get" id="search-members-form">
-		<label><input type="text" name="s" id="members_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+		<label><input type="text" name="s" id="members_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
 		<input type="submit" id="members_search_submit" name="members_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
 	</form>
 <?php
@@ -1040,6 +1040,25 @@
 	return apply_filters( 'bp_search_form_type_select', $selection_box );
 }
 
+/**
+ * Get the default text for the search box for a given component.
+ *
+ * @global object $bp BuddyPress global settings
+ * @return string
+ * @since 1.3
+ */
+function bp_search_default_text() {
+    echo bp_get_search_default_text();
+}
+    function bp_get_search_default_text( $component = false ) {
+        global $bp;
+        
+        if ( empty( $component ) )
+            $component = $bp->current_component;
+        
+        return apply_filters( 'bp_search_default_text', $bp->default_search_strings[$component], $component );
+    }
+
 function bp_search_form() {
 	$form = '
 		<form action="' . bp_search_form_action() . '" method="post" id="search-form">
Index: bp-core/bp-core-classes.php
===================================================================
--- bp-core/bp-core-classes.php	(revision 3383)
+++ bp-core/bp-core-classes.php	(working copy)
@@ -166,7 +166,7 @@
 			}
 		}
 
-		if ( $search_terms && function_exists( 'xprofile_install' ) ) {
+		if ( $search_terms && bp_is_active( 'xprofile' ) ) {
 			$search_terms = like_escape( $wpdb->escape( $search_terms ) );
 			$sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";
 		}
Index: bp-blogs.php
===================================================================
--- bp-blogs.php	(revision 3383)
+++ bp-blogs.php	(working copy)
@@ -25,6 +25,8 @@
 	/* Register this in the active components array */
 	$bp->active_components[$bp->blogs->slug] = $bp->blogs->id;
 
+	$bp->default_search_strings['blogs'] = __( 'Search Blogs...', 'buddypress' );
+
 	do_action( 'bp_blogs_setup_globals' );
 }
 add_action( 'bp_setup_globals', 'bp_blogs_setup_globals' );
Index: bp-forums.php
===================================================================
--- bp-forums.php	(revision 3383)
+++ bp-forums.php	(working copy)
@@ -27,6 +27,8 @@
 
 	/* Register this in the active components array */
 	$bp->active_components[$bp->forums->slug] = $bp->forums->id;
+	
+      $bp->default_search_strings['forums'] = __( 'Search Forum Topics...', 'buddypress' );
 
 	do_action( 'bp_forums_setup' );
 }
Index: bp-groups.php
===================================================================
--- bp-groups.php	(revision 3383)
+++ bp-groups.php	(working copy)
@@ -40,6 +40,8 @@
 	// Auto join group when non group member performs group activity
 	$bp->groups->auto_join = defined( 'BP_DISABLE_AUTO_GROUP_JOIN' ) ? false : true;
 
+       $bp->default_search_strings['groups'] = __( 'Search Groups...', 'buddypress' );
+
 	do_action( 'groups_setup_globals' );
 }
 add_action( 'bp_setup_globals', 'groups_setup_globals' );
Index: bp-blogs/bp-blogs-templatetags.php
===================================================================
--- bp-blogs/bp-blogs-templatetags.php	(revision 3383)
+++ bp-blogs/bp-blogs-templatetags.php	(working copy)
@@ -496,9 +496,15 @@
 }
 
 function bp_directory_blogs_search_form() {
-	global $bp; ?>
+	global $bp; 
+	
+	$default_search_value = bp_get_search_default_text();
+	
+	$search_value = !empty( $_REQUEST['s'] ) ? $_REQUEST['s'] : $default_search_value;
+	
+	?>
 	<form action="" method="get" id="search-blogs-form">
-		<label><input type="text" name="s" id="blogs_search" value="<?php if ( isset( $_GET['s'] ) ) { echo $_GET['s']; } else { _e( 'Search anything...', 'buddypress' ); } ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+		<label><input type="text" name="s" id="blogs_search" value="<?php echo esc_attr( $search_value ) ?>" onfocus="if (this.value == $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
 		<input type="submit" id="blogs_search_submit" name="blogs_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
 	</form>
 <?php
Index: bp-forums/bp-forums-templatetags.php
===================================================================
--- bp-forums/bp-forums-templatetags.php	(revision 3383)
+++ bp-forums/bp-forums-templatetags.php	(working copy)
@@ -1025,13 +1025,13 @@
 function bp_directory_forums_search_form() {
 	global $bp;
 
-	$search_value = __( 'Search anything...', 'buddypress' );
-	if ( !empty( $_REQUEST['fs'] ) )
-	 	$search_value = $_REQUEST['fs'];
+	$default_search_value = bp_get_search_default_text();
+	
+	$search_value = !empty( $_REQUEST['fs'] ) ? $_REQUEST['fs'] : $default_search_value;
 
 ?>
 	<form action="" method="get" id="search-forums-form">
-		<label><input type="text" name="s" id="forums_search" value="<?php echo esc_attr($search_value) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+		<label><input type="text" name="s" id="forums_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
 		<input type="submit" id="forums_search_submit" name="forums_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
 	</form>
 <?php
Index: bp-core.php
===================================================================
--- bp-core.php	(revision 3383)
+++ bp-core.php	(working copy)
@@ -81,10 +81,13 @@
 	/* The names of the core WordPress pages used to display BuddyPress content */
 	$bp->pages = $bp_pages;
 
-	/* Set up the members id and active components entry */
+	// Set up the members id and active components entry
 	$bp->members->id = 'members';
 	$bp->members->slug = $bp->pages->members->slug;
 	$bp->active_components[$bp->members->slug] = $bp->members->id;
+	
+	// Set up the default search text for the members component
+	$bp->default_search_strings['members'] = __( 'Search Members...', 'buddypress' );
 
 	/* The user ID of the user who is currently logged in. */
 	$bp->loggedin_user->id = $current_user->ID;
Index: bp-groups/bp-groups-templatetags.php
===================================================================
--- bp-groups/bp-groups-templatetags.php	(revision 3383)
+++ bp-groups/bp-groups-templatetags.php	(working copy)
@@ -1810,13 +1810,13 @@
 function bp_directory_groups_search_form() {
 	global $bp;
 
-	$search_value = __( 'Search anything...', 'buddypress' );
-	if ( !empty( $_REQUEST['s'] ) )
-	 	$search_value = $_REQUEST['s'];
+	$default_search_value = bp_get_search_default_text();
+	
+	$search_value = !empty( $_REQUEST['s'] ) ? $_REQUEST['s'] : $default_search_value;
 
 ?>
 	<form action="" method="get" id="search-groups-form">
-		<label><input type="text" name="s" id="groups_search" value="<?php echo esc_attr($search_value) ?>"  onfocus="if (this.value == '<?php _e( 'Search anything...', 'buddypress' ) ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php _e( 'Search anything...', 'buddypress' ) ?>';}" /></label>
+		<label><input type="text" name="s" id="groups_search" value="<?php echo esc_attr( $search_value ) ?>"  onfocus="if (this.value == '<?php echo $default_search_value ?>') {this.value = '';}" onblur="if (this.value == '') {this.value = '<?php echo $default_search_value ?>';}" /></label>
 		<input type="submit" id="groups_search_submit" name="groups_search_submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
 	</form>
 <?php