Index: bp-core/admin/bp-core-actions.php
===================================================================
--- bp-core/admin/bp-core-actions.php	(revision 7586)
+++ bp-core/admin/bp-core-actions.php	(working copy)
@@ -41,7 +41,7 @@
 add_action( 'admin_init',              'bp_admin_init'                    );
 add_action( 'admin_head',              'bp_admin_head'                    );
 add_action( 'admin_notices',           'bp_admin_notices'                 );
-add_action( 'admin_enqueue_scripts',   'bp_admin_enqueue_scripts'         );
+add_action( 'admin_enqueue_scripts',   'bp_admin_enqueue_scripts',  10, 1 );
 add_action( 'network_admin_menu',      'bp_admin_menu'                    );
 add_action( 'custom_menu_order',       'bp_admin_custom_menu_order'       );
 add_action( 'menu_order',              'bp_admin_menu_order'              );
@@ -130,13 +130,13 @@
 }
 
 /**
- * Piggy back admin_notices action
+ * Piggy back admin_enqueue_scripts action
  *
  * @since BuddyPress (1.7)
- * @uses do_action() Calls 'bp_admin_notices'
+ * @uses do_action() Calls 'bp_admin_enqueue_scripts'
  */
-function bp_admin_enqueue_scripts() {
-	do_action( 'bp_admin_enqueue_scripts' );
+function bp_admin_enqueue_scripts( $hook_suffix = '' ) {
+	do_action( 'bp_admin_enqueue_scripts', $hook_suffix  );
 }
 
 /**
Index: bp-xprofile/bp-xprofile-functions.php
===================================================================
--- bp-xprofile/bp-xprofile-functions.php	(revision 7586)
+++ bp-xprofile/bp-xprofile-functions.php	(working copy)
@@ -758,6 +758,7 @@
 	}
 
 	$field_ids = array();
+
 	foreach( (array) $user_visibility_levels as $field_id => $field_visibility ) {
 		if ( in_array( $field_visibility, $levels ) ) {
 			$field_ids[] = $field_id;