diff --git a/assets/js/public/form-field-unique.js b/assets/js/public/form-field-unique.js
index 69437340..84f76e82 100644
--- a/assets/js/public/form-field-unique.js
+++ b/assets/js/public/form-field-unique.js
@@ -84,12 +84,16 @@
 						const iname = input.prop( 'name' );
 						const curid = input.prop( 'id' );
 						const forid = form.data( 'id' );
+						const radioname = label.find( '.forminator-radio-option' );
+						const optionid = curid + '-option-' + forid;
 						const uname = iname + '-' + forid;
 						const unqid = curid + '-' + forid;
 
 						input.prop( 'id', unqid );
 						input.prop( 'name', uname );
 						label.prop( 'for', unqid );
+						input.attr( 'aria-labelledby', optionid );
+						radioname.prop( 'id', optionid );
 
 					});
 				}
@@ -108,10 +112,14 @@
 						const label = input.parent();
 						const curid = input.prop( 'id' );
 						const forid = form.data( 'id' );
+						const checkboxname = label.find( '.forminator-checkbox-option' );
+						const optionid = curid + '-option-' + forid;
 						const unqid = curid + '-' + forid;
 
 						input.prop( 'id', unqid );
 						label.prop( 'for', unqid );
+						input.attr( 'aria-labelledby', optionid );
+						checkboxname.prop( 'id', optionid );
 
 					});
 				}
diff --git a/templates/form-elements/field-checkbox.html b/templates/form-elements/field-checkbox.html
index 4fea367e..1cb85ab5 100644
--- a/templates/form-elements/field-checkbox.html
+++ b/templates/form-elements/field-checkbox.html
@@ -12,7 +12,7 @@
 			id="checkbox-option-1"
 		/>
 		<span aria-hidden="true"></span>
-		<span>Design</span>
+		<span class="forminator-checkbox-option">Design</span>
 	</label>
 
 	<label
@@ -25,7 +25,7 @@
 			id="checkbox-option-2"
 		/>
 		<span aria-hidden="true"></span>
-		<span>Development</span>
+		<span class="forminator-checkbox-option">Development</span>
 	</label>
 
 	<label
@@ -38,7 +38,7 @@
 			id="checkbox-option-3"
 		/>
 		<span aria-hidden="true"></span>
-		<span>Technical Support</span>
+		<span class="forminator-checkbox-option">Technical Support</span>
 	</label>
 
 	<span class="forminator-error-message" aria-hidden="true">This field is required.</span>
diff --git a/templates/form-elements/field-radio.html b/templates/form-elements/field-radio.html
index 2da094e5..6a83918f 100644
--- a/templates/form-elements/field-radio.html
+++ b/templates/form-elements/field-radio.html
@@ -13,7 +13,7 @@
 			id="radio-option-1"
 		/>
 		<span aria-hidden="true"></span>
-		<span>$100 - $500 USD</span>
+		<span class="forminator-radio-option">$100 - $500 USD</span>
 	</label>
 
 	<label
@@ -27,7 +27,7 @@
 			id="radio-option-2"
 		/>
 		<span aria-hidden="true"></span>
-		<span>$501 - $1000 USD</span>
+		<span class="forminator-radio-option">$501 - $1000 USD</span>
 	</label>
 
 	<label
@@ -41,7 +41,7 @@
 			id="radio-option-3"
 		/>
 		<span aria-hidden="true"></span>
-		<span>$1001 or more USD</span>
+		<span class="forminator-radio-option">$1001 or more USD</span>
 	</label>
 
 	<span class="forminator-error-message">This field is required.</span>