Index: bp-themes/bp-default/members/single/profile/profile-loop.php
--- bp-themes/bp-default/members/single/profile/profile-loop.php Remotely Modified (Based On HEAD)
+++ bp-themes/bp-default/members/single/profile/profile-loop.php Locally Modified (Based On LOCAL)
@@ -9,11 +9,11 @@
 			<?php do_action( 'bp_before_profile_field_content' ) ?>
 
 			<div class="bp-widget <?php bp_the_profile_group_slug() ?>">
-				<?php if ( 1 != bp_get_the_profile_group_id() ) : ?>
-					<h4><?php bp_the_profile_group_name() ?></h4>
-				<?php endif; ?>
 
+				<h4><?php bp_the_profile_group_name() ?></h4>
+
 				<table class="profile-fields">
+
 					<?php while ( bp_profile_fields() ) : bp_the_profile_field(); ?>
 
 						<?php if ( bp_field_has_data() ) : ?>
@@ -33,6 +33,7 @@
 						<?php do_action( 'bp_profile_field_item' ) ?>
 
 					<?php endwhile; ?>
+
 				</table>
 			</div>
 
Index: bp-xprofile/bp-xprofile-classes.php
--- bp-xprofile/bp-xprofile-classes.php Remotely Modified (Based On HEAD)
+++ bp-xprofile/bp-xprofile-classes.php Locally Modified (Based On LOCAL)
@@ -113,6 +113,7 @@
 			'profile_group_id'  => false,
 			'user_id'           => $bp->displayed_user->id,
 			'hide_empty_groups' => false,
+			'hide_empty_fields' => false,
 			'fetch_fields'      => false,
 			'fetch_field_data'  => false,
 			'exclude_groups'    => false,
@@ -157,31 +158,56 @@
 			return $groups;
 
 		if ( $fetch_field_data ) {
+
 			// Fetch the field data for the user.
-			foreach( (array)$fields as $field )
+			foreach( (array) $fields as $field ) {
 				$field_ids[] = $field->id;
+			}
 
-			$field_ids = implode( ',', (array) $field_ids );
+			// Get field data if fields exist
+			if ( !empty( $field_ids ) ) {
 
-			if ( !empty( $field_ids ) )
-				$field_data = $wpdb->get_results( $wpdb->prepare( "SELECT field_id, value FROM {$bp->profile->table_name_data} WHERE field_id IN ( {$field_ids} ) AND user_id = %d", $user_id ) );
+				// Remove data-less fields, if necessary
+				$exclude_empty_data = '';
+				if ( $hide_empty_fields )
+					$exclude_empty_data = $wpdb->prepare( "AND (value != '' AND value IS NOT NULL)" );
+				
+				$field_ids_sql = implode( ',', (array) $field_ids );
+				$field_data    = $wpdb->get_results( $wpdb->prepare( "SELECT field_id, value FROM {$bp->profile->table_name_data} WHERE field_id IN ( {$field_ids_sql} ) {$exclude_empty_data} AND user_id = %d", $user_id ) );
+			}
 
-			if ( !empty( $field_data ) ) {
-				foreach( (array)$fields as $field_key => $field ) {
-					foreach( (array)$field_data as $data ) {
-						if ( $field->id == $data->field_id )
+			// Field data was found
+			if ( !empty( $field_data ) && !is_wp_error( $field_data ) ) {
+
+				// Loop through fields
+				foreach( (array) $fields as $field_key => $field ) {
+					
+					// Loop through data in each field
+					foreach( (array) $field_data as $data ) {
+						
+						// Assign correct data value to each field
+						if ( $field->id == $data->field_id ) {
 							$fields[$field_key]->data->value = $data->value;
+						}
 					}
 				}
 			}
 		}
 
 		// Merge the field array back in with the group array
-		foreach( (array)$groups as $group_key => $group ) {
-			foreach( (array)$fields as $field ) {
-				if ( $group->id == $field->group_id )
+		foreach( (array) $groups as $group_key => $group ) {
+			foreach( (array) $fields as $field ) {
+				if ( $group->id == $field->group_id ) {
 					$groups[$group_key]->fields[] = $field;
+				}
 			}
+			
+			if ( empty( $group->fields ) ) {
+				unset( $groups[$group_key] );
+			}
+			
+			// Reset indexes
+			$groups = array_values( $groups );
 		}
 
 		return $groups;
Index: bp-xprofile/bp-xprofile-template.php
--- bp-xprofile/bp-xprofile-template.php Remotely Modified (Based On HEAD)
+++ bp-xprofile/bp-xprofile-template.php Locally Modified (Based On LOCAL)
@@ -20,15 +20,16 @@
 	var $in_the_loop;
 	var $user_id;
 
-	function bp_xprofile_data_template( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false ) {
-		$this->__construct( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields );
+	function bp_xprofile_data_template( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false, $hide_empty_fields = false ) {
+		$this->__construct( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields, $hide_empty_fields );
 	}
 
-	function __construct( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false ) {
+	function __construct( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false, $hide_empty_fields = false ) {
 		$this->groups = BP_XProfile_Group::get( array(
 			'profile_group_id'  => $profile_group_id,
 			'user_id'           => $user_id,
 			'hide_empty_groups' => $hide_empty_groups,
+			'hide_empty_fields' => $hide_empty_fields,
 			'fetch_fields'      => $fetch_fields,
 			'fetch_field_data'  => $fetch_field_data,
 			'exclude_groups'    => $exclude_groups,
@@ -152,10 +153,14 @@
 function bp_has_profile( $args = '' ) {
 	global $bp, $profile_template;
 
+	// Only show empty fields on the Dashboard or the user profile edit screen
+	$hide_empty_fields = ( bp_is_user_profile_edit() || is_admin() || is_network_admin() );
+
 	$defaults = array(
-		'user_id' => $bp->displayed_user->id,
+		'user_id'           => $bp->displayed_user->id,
 		'profile_group_id'  => false,
 		'hide_empty_groups' => true,
+		'hide_empty_fields' => $hide_empty_fields,
 		'fetch_fields'      => true,
 		'fetch_field_data'  => true,
 		'exclude_groups'    => false, // Comma-separated list of profile field group IDs to exclude
@@ -165,7 +170,7 @@
 	$r = wp_parse_args( $args, $defaults );
 	extract( $r, EXTR_SKIP );
 
-	$profile_template = new BP_XProfile_Data_Template( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields );
+	$profile_template = new BP_XProfile_Data_Template( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields, $hide_empty_fields );
 	return apply_filters( 'bp_has_profile', $profile_template->has_groups(), $profile_template );
 }
 
@@ -189,7 +194,9 @@
 }
 	function bp_get_field_css_class( $class = false ) {
 		global $profile_template;
-
+		static $alt_row;
+		
+		$alt_row     = ( $alt_row === 1 ) ? 2 : 1;
 		$css_classes = array();
 
 		if ( $class )
@@ -201,8 +208,8 @@
 		// Set a class with the field name (sanitized)
 		$css_classes[] = 'field_' . sanitize_title( $profile_template->field->name );
 
-		if ( $profile_template->current_field % 2 == 1 )
-			$css_classes[] = 'alt';
\ No newline at end of file
+		// Add alt row class
+		$css_classes[] = ( $alt_row === 1 ) ? '' : 'alt';
 
 		$css_classes = apply_filters_ref_array( 'bp_field_css_classes', array( &$css_classes ) );
 
