diff --git src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php
index 736c66c..9ea6e14 100644
--- src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php
+++ src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php
@@ -67,7 +67,7 @@ class BP_XProfile_Field_Type_Checkbox extends BP_XProfile_Field_Type {
 		} ?>
 
 		<div class="checkbox">
-			<label for="<?php bp_the_profile_field_input_name(); ?>">
+			<label for="<?php bp_the_profile_field_input_name(); ?>" class="option-group-label">
 				<?php bp_the_profile_field_name(); ?>
 				<?php bp_the_profile_field_required_label(); ?>
 			</label>
@@ -138,7 +138,7 @@ class BP_XProfile_Field_Type_Checkbox extends BP_XProfile_Field_Type {
 				$selected = ' checked="checked"';
 			}
 
-			$new_html = sprintf( '<label for="%3$s"><input %1$s type="checkbox" name="%2$s" id="%3$s" value="%4$s">%5$s</label>',
+			$new_html = sprintf( '<label for="%3$s" class="option-label"><input %1$s type="checkbox" name="%2$s" id="%3$s" value="%4$s">%5$s</label>',
 				$selected,
 				esc_attr( "field_{$this->field_obj->id}[]" ),
 				esc_attr( "field_{$options[$k]->id}_{$k}" ),
diff --git src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php
index aa3bc0b..ed59424 100644
--- src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php
+++ src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php
@@ -66,7 +66,7 @@ class BP_XProfile_Field_Type_Radiobutton extends BP_XProfile_Field_Type {
 
 		<div class="radio">
 
-			<label for="<?php bp_the_profile_field_input_name(); ?>">
+			<label for="<?php bp_the_profile_field_input_name(); ?>" class="option-group-label">
 				<?php bp_the_profile_field_name(); ?>
 				<?php bp_the_profile_field_required_label(); ?>
 			</label>
@@ -131,7 +131,7 @@ class BP_XProfile_Field_Type_Radiobutton extends BP_XProfile_Field_Type {
 				$selected = ' checked="checked"';
 			}
 
-			$new_html = sprintf( '<label for="%3$s"><input %1$s type="radio" name="%2$s" id="%3$s" value="%4$s">%5$s</label>',
+			$new_html = sprintf( '<label for="%3$s" class="option-label"><input %1$s type="radio" name="%2$s" id="%3$s" value="%4$s">%5$s</label>',
 				$selected,
 				esc_attr( "field_{$this->field_obj->id}" ),
 				esc_attr( "option_{$options[$k]->id}" ),