diff --git a/app/views/controllers/names/trackers/_form.html.erb b/app/views/controllers/names/trackers/_form.html.erb
index 0005038030..2aa6179ba8 100644
--- a/app/views/controllers/names/trackers/_form.html.erb
+++ b/app/views/controllers/names/trackers/_form.html.erb
@@ -1,9 +1,11 @@
 <%
 # This form can create OR update a tracker, via params[:commit]
 # Idk why rails does not recognize the model scope and nest the attributes.
+form_args = { url: action, method: method, id: "name_tracker_form" }
+form_args[:model] = @name_tracker if @name_tracker
 %>
-<%= form_with(model: @name_tracker, url: action, method: method,
-              id: "name_tracker_form") do |f| %>
+
+<%= form_with(**form_args) do |f| %>
 
   <div class="text-center my-3">
     <%= if @name_tracker
diff --git a/config/initializers/new_framework_defaults_7_1.rb b/config/initializers/new_framework_defaults_7_1.rb
index 221c345c50..0e6cca1368 100644
--- a/config/initializers/new_framework_defaults_7_1.rb
+++ b/config/initializers/new_framework_defaults_7_1.rb
@@ -38,8 +38,8 @@
 # Do not treat an `ActionController::Parameters` instance
 # as equal to an equivalent `Hash` by default.
 #++
-Rails.application.config.action_controller.
-  allow_deprecated_parameters_hash_equality = false
+# Rails.application.config.action_controller.
+#   allow_deprecated_parameters_hash_equality = false
 
 ###
 # Active Record Encryption now uses SHA-256 as its hash digest algorithm.