diff --git src/bp-templates/bp-legacy/css/buddypress-rtl.css src/bp-templates/bp-legacy/css/buddypress-rtl.css
index f089c4e..3d72862 100644
--- src/bp-templates/bp-legacy/css/buddypress-rtl.css
+++ src/bp-templates/bp-legacy/css/buddypress-rtl.css
@@ -653,7 +653,8 @@ body.activity-permalink #buddypress div.activity-comments div.acomment-content {
 	margin-bottom: 5px;
 }
 #buddypress .standard-form label,
-#buddypress .standard-form span.label {
+#buddypress .standard-form span.label,
+#buddypress .standard-form legend {
 	display: block;
 	font-weight: bold;
 	margin: 15px 0 5px 0;
@@ -664,8 +665,8 @@ body.activity-permalink #buddypress div.activity-comments div.acomment-content {
 	font-weight: normal;
 	margin: auto;
 }
-#buddypress .standard-form div.checkbox label:nth-child(n+2),
-#buddypress .standard-form div.radio div label {
+#buddypress .standard-form .checkbox label,
+#buddypress .standard-form .radio label {
 	color: #767676;
 	font-size: 100%;
 	font-weight: normal;
diff --git src/bp-templates/bp-legacy/css/buddypress.css src/bp-templates/bp-legacy/css/buddypress.css
index 2946a20..5bc95c2 100644
--- src/bp-templates/bp-legacy/css/buddypress.css
+++ src/bp-templates/bp-legacy/css/buddypress.css
@@ -653,7 +653,8 @@ body.activity-permalink #buddypress div.activity-comments div.acomment-content {
 	margin-bottom: 5px;
 }
 #buddypress .standard-form label,
-#buddypress .standard-form span.label {
+#buddypress .standard-form span.label,
+#buddypress .standard-form legend {
 	display: block;
 	font-weight: bold;
 	margin: 15px 0 5px 0;
@@ -664,8 +665,8 @@ body.activity-permalink #buddypress div.activity-comments div.acomment-content {
 	font-weight: normal;
 	margin: auto;
 }
-#buddypress .standard-form div.checkbox label:nth-child(n+2),
-#buddypress .standard-form div.radio div label {
+#buddypress .standard-form .checkbox label,
+#buddypress .standard-form .radio label {
 	color: #767676;
 	font-size: 100%;
 	font-weight: normal;
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 48af638..a49e5d6 100644
--- src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php
+++ src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox.php
@@ -67,11 +67,11 @@ class BP_XProfile_Field_Type_Checkbox extends BP_XProfile_Field_Type {
 			$user_id = bp_displayed_user_id();
 		} ?>
 
-		<div class="checkbox">
-			<label for="<?php bp_the_profile_field_input_name(); ?>">
+		<fieldset class="checkbox">
+			<legend>
 				<?php bp_the_profile_field_name(); ?>
 				<?php bp_the_profile_field_required_label(); ?>
-			</label>
+			</legend>
 
 			<?php
 
@@ -82,7 +82,7 @@ class BP_XProfile_Field_Type_Checkbox extends BP_XProfile_Field_Type {
 				'user_id' => $user_id
 			) ); ?>
 
-		</div>
+		</fieldset>
 
 		<?php
 	}
diff --git src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php
index 1f3430b..8f3476e 100644
--- src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php
+++ src/bp-xprofile/classes/class-bp-xprofile-field-type-datebox.php
@@ -78,12 +78,12 @@ class BP_XProfile_Field_Type_Datebox extends BP_XProfile_Field_Type {
 			'name' => bp_get_the_profile_field_input_name() . '_year'
 		) ); ?>
 
-		<div class="datebox">
+		<fieldset class="datebox">
 
-			<label for="<?php bp_the_profile_field_input_name(); ?>_day">
+			<legend>
 				<?php bp_the_profile_field_name(); ?>
 				<?php bp_the_profile_field_required_label(); ?>
-			</label>
+			</legend>
 
 			<?php
 
@@ -120,7 +120,7 @@ class BP_XProfile_Field_Type_Datebox extends BP_XProfile_Field_Type {
 				) ); ?>
 			</select>
 
-		</div>
+		</fieldset>
 	<?php
 	}
 
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 d0637e5..274b8ee 100644
--- src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php
+++ src/bp-xprofile/classes/class-bp-xprofile-field-type-radiobutton.php
@@ -65,12 +65,12 @@ class BP_XProfile_Field_Type_Radiobutton extends BP_XProfile_Field_Type {
 			$user_id = bp_displayed_user_id();
 		} ?>
 
-		<div class="radio">
+		<fieldset class="radio">
 
-			<label for="<?php bp_the_profile_field_input_name(); ?>">
+			<legend>
 				<?php bp_the_profile_field_name(); ?>
 				<?php bp_the_profile_field_required_label(); ?>
-			</label>
+			</legend>
 
 			<?php
 
@@ -87,7 +87,7 @@ class BP_XProfile_Field_Type_Radiobutton extends BP_XProfile_Field_Type {
 
 			<?php endif; ?>
 
-		</div>
+		</fieldset>
 
 		<?php
 	}