Index: bp-xprofile.php
===================================================================
--- bp-xprofile.php	(revision 3055)
+++ bp-xprofile.php	(working copy)
@@ -22,8 +22,10 @@
 		define ( 'BP_XPROFILE_SLUG', 'profile' );
 
 	/* Assign the base group and fullname field names to constants to use in SQL statements */
-	define ( 'BP_XPROFILE_BASE_GROUP_NAME', $bp->site_options['bp-xprofile-base-group-name'] );
-	define ( 'BP_XPROFILE_FULLNAME_FIELD_NAME', $bp->site_options['bp-xprofile-fullname-field-name'] );
+	if ( !defined( 'BP_XPROFILE_BASE_GROUP_NAME' ) )
+		define ( 'BP_XPROFILE_BASE_GROUP_NAME', $bp->site_options['bp-xprofile-base-group-name'] );
+	if ( !defined( 'BP_XPROFILE_FULLNAME_FIELD_NAME' ) )
+		define ( 'BP_XPROFILE_FULLNAME_FIELD_NAME', $bp->site_options['bp-xprofile-fullname-field-name'] );
 
 	/* For internal identification */
 	$bp->profile->id = 'profile';
