diff --git a/app/views/dmsf_workflows/_new_step_form.html.erb b/app/views/dmsf_workflows/_new_step_form.html.erb
deleted file mode 100644
index afd20f26..00000000
--- a/app/views/dmsf_workflows/_new_step_form.html.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-<%
-# encoding: utf-8
-#
-# Redmine plugin for Document Management System "Features"
-#
-# Copyright © 2011-20 Karel Pičman <karel.picman@kontron.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-%>
-
-<fieldset class="box">
-  <legend><%= l(:label_dmsf_workflow_add_approver) %></legend>
-  <p><%= label_tag 'user_search', l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>    
-  <%= late_javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_dmsf_workflow_path(@dmsf_workflow, dmsf_workflow_step_assignment_id: nil, dmsf_file_revision_id: nil, project_id: @project ? @project.id : nil) }')" %>
-  <div id="dmsf_users_for_delegate">
-    <%= render_principals_for_new_dmsf_workflow_users @dmsf_workflow %>
-  </div>
-</fieldset>
-
-<fieldset class="box">
-  <legend><%= l(:label_dmsf_workflow_step) %></legend>
-  <%= select_tag 'step', dmsf_workflow_steps_options_for_select(@steps),
-    id: 'selected_step', onchange: "$('#dmsf_step_name').toggle(this.value == 0);", style: 'max-width: 40%' %>
-  <span id="dmsf_step_name">&nbsp;
-    <%= label_tag 'name', l(:field_name) %>
-    <%= text_field_tag 'name', nil, maxlength: 30, style: 'max-width: 40%' %>
-  </span>
-</fieldset>
-
-<%= late_javascript_tag do %>
-  $("div#users input:checkbox").on("change", function(){
-    let n = $("div#users input[type='checkbox']:checked").length;
-    $("#add-step-and:submit").prop("disabled", n < 1);
-    $("#add-step-or:submit").prop("disabled", n < 2);
-  });
-<% end %>
diff --git a/app/views/dmsf_workflows/_new_step_modal.html.erb b/app/views/dmsf_workflows/_new_step_modal.html.erb
index ed8aa112..9e6aaf08 100644
--- a/app/views/dmsf_workflows/_new_step_modal.html.erb
+++ b/app/views/dmsf_workflows/_new_step_modal.html.erb
@@ -23,11 +23,29 @@
 <h3 class="title"><%= l(:dmsf_new_step) %></h3>
 
 <%= labelled_form_for(@dmsf_workflow, { url: edit_dmsf_workflow_path(@dmsf_workflow), method: :post }) do |f| %>
-  <%= render partial: 'new_step_form' %>
+  <fieldset class="box">
+    <legend><%= l(:label_dmsf_workflow_add_approver) %></legend>
+    <p><%= label_tag 'user_search', l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
+    <%= late_javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_dmsf_workflow_path(@dmsf_workflow, dmsf_workflow_step_assignment_id: nil, dmsf_file_revision_id: nil, project_id: @project ? @project.id : nil) }')" %>
+    <div id="dmsf_users_for_delegate">
+      <%= render_principals_for_new_dmsf_workflow_users @dmsf_workflow %>
+    </div>
+  </fieldset>
+
+  <fieldset class="box">
+    <legend><%= l(:label_dmsf_workflow_step) %></legend>
+    <%= select_tag 'step', dmsf_workflow_steps_options_for_select(@steps),
+                   id: 'selected_step', onchange: "$('#dmsf_step_name').toggle(this.value == 0);", style: 'max-width: 40%' %>
+    <span id="dmsf_step_name">&nbsp;
+      <%= label_tag 'name', l(:field_name) %>
+      <%= text_field_tag 'name', nil, maxlength: 30, style: 'max-width: 40%' %>
+  </span>
+  </fieldset>
+
   <p class="buttons">
     <%= l(:label_add_width) %>
-    <%= f.submit l(:dmsf_and), id: 'add-step-and', disabled: true %>
-    <%= f.submit l(:dmsf_or), id: 'add-step-or', disabled: true %>
+    <%= f.submit l(:dmsf_and), id: 'add-step-and' %>
+    <%= f.submit l(:dmsf_or), id: 'add-step-or' %>
     <%= link_to_function l(:button_cancel), 'hideModal(this);' %>
   </p>
 <% end %>