diff --git a/components/financial_assistance/app/views/financial_assistance/benefits/index.html.erb b/components/financial_assistance/app/views/financial_assistance/benefits/index.html.erb
index a0cf6be266e..080a06bb34b 100644
--- a/components/financial_assistance/app/views/financial_assistance/benefits/index.html.erb
+++ b/components/financial_assistance/app/views/financial_assistance/benefits/index.html.erb
@@ -57,12 +57,12 @@
       <fieldset id="ai_an_health_service_eligible_question" class="pb-4 driver-question">
         <legend class="weight-n instruction-row"><%= l10n("faa.indian_health_service_eligible") %></legend>
         <div class="focus d-flex mt-3 instruction-row">
-          <label class="radio mr-3" for="ai_an_health_service_eligible_true">
-            <input id="ai_an_health_service_eligible_true" type="radio" value="true" name="ai_an_health_service_eligible" <%='checked' if @applicant.health_service_eligible == true %>>
+          <label class="radio mr-3">
+            <%= radio_button_tag("health_service_eligible", true, @applicant.health_service_eligible) %>            
             <span><%= l10n("yes") %></span>
           </label>
-          <label class="radio mr-3" for="ai_an_health_service_eligible_false">
-            <input id="ai_an_health_service_eligible_false" type="radio" value="false" name="ai_an_health_service_eligible" <%='checked'if @applicant.health_service_eligible == false %>>
+          <label class="radio mr-3">
+            <%= radio_button_tag("health_service_eligible", false, @applicant.health_service_eligible == false) %>
             <span><%= l10n("no") %></span>
           </label>
         </div>
@@ -71,12 +71,12 @@
       <fieldset id="ai_an_health_service_through_referral_question" class="pb-4 driver-question">
         <legend class="weight-n instruction-row"><%= l10n("faa.indian_health_service") %></legend>
         <div class="focus d-flex mt-3 instruction-row">
-          <label class="radio mr-3" for="ai_an_health_service_through_referral_true">
-            <input id="ai_an_health_service_through_referral_true" type="radio" value="true" name="ai_an_health_service_through_referral" <%='checked' if @applicant.health_service_through_referral == true %>>
+          <label class="radio mr-3">
+            <%= radio_button_tag("health_service_through_referral", true, @applicant.health_service_through_referral) %>
             <span><%= l10n("yes") %></span>
           </label>
-          <label class="radio mr-3" for="ai_an_health_service_through_referral_false">
-            <input id="ai_an_health_service_through_referral_false" type="radio" value="false" name="ai_an_health_service_through_referral" <%='checked'if @applicant.health_service_through_referral == false %>>
+          <label class="radio mr-3">
+            <%= radio_button_tag("health_service_through_referral", false, @applicant.health_service_through_referral == false) %>
             <span><%= l10n("no") %></span>
           </label>
         </div>