diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income.html.erb
index 3239b215d6f..66ed8d015da 100644
--- a/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income.html.erb
+++ b/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income.html.erb
@@ -24,8 +24,8 @@
         </div>
       </div>
       <div class="d-flex mb-2">
-        <a tabindex="0" onkeydown="handleButtonKeyDown(event, 'unemployment-income-delete-<%= dom_id income %>')" id="unemployment-income-delete-<%= dom_id income %>" class="button outline error mr-2 unemployment-income-delete"><%= l10n("faa.edit.remove") %></a>
-        <a tabindex="0" onkeydown="handleButtonKeyDown(event, 'unemployment-income-edit-<%= dom_id income %>')" id="unemployment-income-edit-<%= dom_id income %>" class="button outline unemployment-income-edit"><%=l10n("edit")%></a>
+        <a tabindex="0" data-keydown-id='unemployment-income-delete-<%= dom_id income %>' id="unemployment-income-delete-<%= dom_id income %>" class="button outline error mr-2 unemployment-income-delete"><%= l10n("faa.edit.remove") %></a>
+        <a tabindex="0" data-keydown-id='unemployment-income-edit-<%= dom_id income %>' id="unemployment-income-edit-<%= dom_id income %>" class="button outline unemployment-income-edit"><%=l10n("edit")%></a>
       </div>
     </div>
     <div class="edit-unemployment-income-form hidden">
diff --git a/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income_form.html.erb b/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income_form.html.erb
index 05713d7216a..c7bce4728f7 100644
--- a/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income_form.html.erb
+++ b/components/financial_assistance/app/views/financial_assistance/incomes/_unemployment_income_form.html.erb
@@ -5,7 +5,6 @@
       <% income_id = income.id %>
       <% new_form = local_assigns[:new_form].present? ? local_assigns[:new_form] : false %>
       <% dummy_income_id = "#{income_id}#{new_form ? 'dummy' : ''}" # needed to prevent Multiple Form Label accessibility error %>
-      <% onchange_date = FinancialAssistanceRegistry[:income_and_deduction_date_warning].enabled? ? (raw "validateDateWarnings('#{income_id}', true)") : "" %>
       <%= f.hidden_field :kind, value: 'unemployment_income' %>
 
       <% if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning) %>
@@ -23,16 +22,16 @@
         </div>
         <div class="mr-auto col-sm col-md-6 col-lg-3 p-0 pr-4">
           <%= f.label :start_on, l10n("start_date"), class: "required", for: "start_on_#{dummy_income_id}" %>
-          <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", onchange: onchange_date, class: "w-100" %>
+          <%= f.date_field :start_on, min: 110.years.ago, max:"9999-12-31", required: true, id: "start_on_#{dummy_income_id}", class: "w-100" %>
         </div>
         <div class="col-sm col-md-6 col-lg-3 p-0 pr-4">
           <%= f.label :end_on, l10n("end_date"), for: "end_on_#{dummy_income_id}" %>
-          <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", onchange: onchange_date, class: "w-100 #{'end-on-field' if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning)}" %>
+          <%= f.date_field :end_on, min: 110.years.ago, max:"9999-12-31", id: "end_on_#{dummy_income_id}", class: "w-100 #{'end-on-field' if FinancialAssistanceRegistry.feature_enabled?(:other_income_end_date_warning)}" %>
         </div>
       </div>
       <div class="d-flex mb-2">
-        <a tabindex="0" onkeydown="handleButtonKeyDown(event, 'unemployment-cancel-<%= income_id %>')" id="unemployment-cancel-<%= income_id %>" class="button outline mr-2 unemployment-income-cancel"><%= l10n("cancel") %></a>
-        <%= f.submit l10n("faa.other_incomes.save"), class: "button btn-save", :data => { :cuke => "unemployment-income-save-button" }, onclick: "checkDate('#{income_id}')" %>
+        <a tabindex="0" data-keydown-id='unemployment-cancel-<%= income_id %>' id="unemployment-cancel-<%= income_id %>" class="button outline mr-2 unemployment-income-cancel"><%= l10n("cancel") %></a>
+        <%= f.submit l10n("faa.other_incomes.save"), class: "button btn-save", :data => { :cuke => "unemployment-income-save-button" } %>
       </div>
     </div>