diff --git a/base/forms.py b/base/forms.py
index dd473c101..368db58d4 100644
--- a/base/forms.py
+++ b/base/forms.py
@@ -578,7 +578,8 @@ class JobRoleForm(ModelForm):
         super().__init__(*args, **kwargs)
         if not self.instance.pk:
             self.fields["job_position_id"] = forms.ModelMultipleChoiceField(
-                queryset=self.fields["job_position_id"].queryset
+                queryset=self.fields["job_position_id"].queryset,
+                label=JobRole._meta.get_field("job_position_id").verbose_name,
             )
             attrs = self.fields["job_position_id"].widget.attrs
             attrs["class"] = "oh-select oh-select2 w-100"
diff --git a/base/templates/base/employee_type/employee_type_form.html b/base/templates/base/employee_type/employee_type_form.html
index 019dbeb48..68ad294c4 100644
--- a/base/templates/base/employee_type/employee_type_form.html
+++ b/base/templates/base/employee_type/employee_type_form.html
@@ -1,37 +1,22 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header">
-  <span class="oh-modal__dialog-title" id="editModal1ModalLabel"
-    >
-    {% if employee_type.id %}
-      {% trans "Update Employee Type" %}
-    {% else %}
-      {% trans "Create Employee Type" %}
-    {% endif %}
-</span>
-  <button class="oh-modal__close" aria-label="Close">
-    <ion-icon name="close-outline"></ion-icon>
-  </button>
+    <span class="oh-modal__dialog-title" id="editModal1ModalLabel">
+        {% if employee_type.id %} {% trans "Update" %} {% else %} {% trans "Create" %} {% endif %} {{form.verbose_name}}
+    </span>
+    <button class="oh-modal__close" aria-label="Close">
+        <ion-icon name="close-outline"></ion-icon>
+    </button>
 </div>
 <div class="oh-modal__dialog-body">
-  <form
-    {% if employee_type.id %}
-      hx-post="{% url 'employee-type-update' employee_type.id %}"
-    {% else %}
-      hx-post="{% url 'employee-type-create' %}?dynamic={{dynamic}}"
-    {% endif %}
-    {% if dynamic %}
-      hx-target="#dynamicCreateModalBody"
-    {% else %}
-      hx-target="#employeeTypeForm"
-    {% endif %}
-    class="oh-profile-section"
-    >
-    {% csrf_token %} {{form.non_field_errors}}
-    {{form.as_p}}
-    <div class="oh-modal__dialog-footer p-0 mt-3">
-      <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
-        {% trans "Save" %}
-      </button>
-    </div>
-  </form>
+    <form hx-post="{{ request.get_full_path }}"
+        hx-target=" {% if dynamic %} #dynamicCreateModalBody {% else %} #employeeTypeForm {% endif %}"
+        class="oh-profile-section">
+        {% csrf_token %} {{form.non_field_errors}}
+        {{form.as_p}}
+        <div class="oh-modal__dialog-footer p-0 mt-3">
+            <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
 </div>
diff --git a/base/templates/base/job_role/job_role_form.html b/base/templates/base/job_role/job_role_form.html
index b85f929a1..08c6db7d0 100644
--- a/base/templates/base/job_role/job_role_form.html
+++ b/base/templates/base/job_role/job_role_form.html
@@ -1,46 +1,31 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
-  <span class="oh-modal__dialog-title" id="confirmModalLabel"
-    >
-    {% if job_role.id %}
-      {% trans "Update Job Role" %}
-    {% else %}
-      {% trans "Create Job Role" %}
-    {% endif %}
-  </span>
-  <button class="oh-modal__close" aria-label="Close">
-    <ion-icon name="close-outline"></ion-icon>
-  </button>
+    <span class="oh-modal__dialog-title" id="confirmModalLabel">
+        {% if job_role.id %} {% trans "Update" %} {% else %} {% trans "Create" %} {% endif %} {{form.verbose_name}}
+    </span>
+    <button class="oh-modal__close" aria-label="Close">
+        <ion-icon name="close-outline"></ion-icon>
+    </button>
 </div>
 <div class="oh-modal__dialog-body">
-  <form
-    {% if job_role.id %}
-      hx-post="{% url 'job-role-update' job_role.id %}"
-    {% else %}
-      hx-post="{% url 'job-role-create' %}?dynamic={{dynamic}}"
-    {% endif %}
-    {% if dynamic %}
-      hx-target="#dynamicCreateModalBody"
-    {% else %}
-      hx-target="#jobRoleForm"
-    {%endif%}
-    class="oh-profile-section"
-    >
-    {% csrf_token %} {{form.non_field_errors}}
-    <div class="oh-inner-sidebar-content__body">
-      <div class="oh-input-group mb-2">
-        <label class="mb-1"> {% trans "Job Position:" %} </label>
-        {{form.job_position_id.errors}} {{form.job_position_id}}
-      </div>
-      <div class="oh-input-group mb-2">
-        <label class="mb-1"> {% trans "Job Role:" %} </label>
-        {{form.job_role.errors}} {{form.job_role}}
-      </div>
-    </div>
-    <div class="oh-modal__dialog-footer p-0 mt-3">
-      <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
-        {% trans "Save" %}
-      </button>
-    </div>
-  </form>
+    <form hx-post="{{ request.get_full_path }}"
+        hx-target=" {% if dynamic %} #dynamicCreateModalBody {% else %} #jobRoleForm {%endif%}"
+        class="oh-profile-section">
+        {% csrf_token %} {{form.non_field_errors}}
+        <div class="oh-inner-sidebar-content__body">
+            <div class="oh-input-group mb-2">
+                <label class="mb-1"> {{form.job_position_id.label}} </label>
+                {{form.job_position_id.errors}} {{form.job_position_id}}
+            </div>
+            <div class="oh-input-group mb-2">
+                <label class="mb-1"> {{form.job_role.label}} </label>
+                {{form.job_role.errors}} {{form.job_role}}
+            </div>
+        </div>
+        <div class="oh-modal__dialog-footer p-0 mt-3">
+            <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
 </div>
diff --git a/base/templates/base/rotating_shift/htmx/rotating_shift_form.html b/base/templates/base/rotating_shift/htmx/rotating_shift_form.html
index 0a72aa52e..ce22b27ee 100644
--- a/base/templates/base/rotating_shift/htmx/rotating_shift_form.html
+++ b/base/templates/base/rotating_shift/htmx/rotating_shift_form.html
@@ -1,34 +1,22 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
-  <h2 class="oh-modal__dialog-title" id="editModal1ModalLabel">
-    {% if rshift.id %}
-      {% trans "Update Rotating Shift" %}
-    {% else %}
-      {% trans "Create Rotating Shift" %}
-    {% endif %}
-  </h2>
-  <button class="oh-modal__close" aria-label="Close">
-    <ion-icon name="close-outline"></ion-icon>
-  </button>
+    <h2 class="oh-modal__dialog-title" id="editModal1ModalLabel">
+        {% if rshift.id %} {% trans "Update" %} {% else %} {% trans "Create" %} {% endif %} {{form.verbose_name}}
+    </h2>
+    <button class="oh-modal__close" aria-label="Close">
+        <ion-icon name="close-outline"></ion-icon>
+    </button>
 </div>
 <div class="oh-modal__dialog-body">
-  <form
-    {% if rshift.id %}
-      hx-post="{% url 'rotating-shift-update' rshift.id %}"
-      hx-target="#objectUpdateModalTarget"
-    {% else %}
-      hx-post="{% url 'rotating-shift-create' %}"
-      hx-target="#objectCreateModalTarget"
-    {% endif %}
-    class="oh-profile-section"
-  >
-    {% csrf_token %}
-    {{form.as_p}}
-
-    <div class="oh-modal__dialog-footer p-0 mt-3">
-      <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
-        {% trans "Save" %}
-      </button>
-    </div>
-  </form>
+    <form hx-post="{{ request.get_full_path }}"
+        hx-target="{% if rshift.id %}#objectUpdateModalTarget{% else %}#objectCreateModalTarget{% endif %}"
+        class="oh-profile-section">
+        {% csrf_token %}
+        {{form.as_p}}
+        <div class="oh-modal__dialog-footer p-0 mt-3">
+            <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
 </div>
diff --git a/base/templates/base/rotating_work_type/htmx/rotating_work_type_form.html b/base/templates/base/rotating_work_type/htmx/rotating_work_type_form.html
index 9bf033ddc..d1f16eeca 100644
--- a/base/templates/base/rotating_work_type/htmx/rotating_work_type_form.html
+++ b/base/templates/base/rotating_work_type/htmx/rotating_work_type_form.html
@@ -1,32 +1,21 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
-  <h2 class="oh-modal__dialog-title" id="editModal1ModalLabel">
-    {% if r_type.id %}
-      {% trans "Update Rotating Work Type" %}
-    {% else %}
-      {% trans "Create Rotating Work Type" %}
-    {% endif %}
-  </h2>
-  <button class="oh-modal__close" aria-label="Close">
-    <ion-icon name="close-outline"></ion-icon>
-  </button>
+    <h2 class="oh-modal__dialog-title" id="editModal1ModalLabel">
+        {% if r_type.id %} {% trans "Update" %} {% else %} {% trans "Create" %} {% endif %} {{form.verbose_name}}
+    </h2>
+    <button class="oh-modal__close" aria-label="Close">
+        <ion-icon name="close-outline"></ion-icon>
+    </button>
 </div>
 <div class="oh-modal__dialog-body">
-  <form
-    {% if r_type.id %}
-        hx-post="{% url 'rotating-work-type-update' r_type.id %}"
-        hx-target="#objectUpdateModalTarget"
-    {% else %}
-        hx-post="{% url 'rotating-work-type-create' %}"
-        hx-target="#objectCreateModalTarget"
-    {% endif %}
-    class="oh-profile-section"
-  >
-    {% csrf_token %} {{form.as_p}}
-    <div class="oh-modal__dialog-footer p-0 mt-3">
-      <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
-        {% trans "Save" %}
-      </button>
-    </div>
-  </form>
+    <form hx-post="{{ request.get_full_path }}"
+        hx-target=" {% if r_type.id %} #objectUpdateModalTarget {% else %} #objectCreateModalTarget {% endif %}"
+        class="oh-profile-section">
+        {% csrf_token %} {{form.as_p}}
+        <div class="oh-modal__dialog-footer p-0 mt-3">
+            <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
 </div>
diff --git a/base/templates/base/shift/schedule_form.html b/base/templates/base/shift/schedule_form.html
index 54ea52427..5a8b8fff0 100644
--- a/base/templates/base/shift/schedule_form.html
+++ b/base/templates/base/shift/schedule_form.html
@@ -1,26 +1,21 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
     <h2 class="oh-modal__dialog-title" id="editModal1ModalLabel">
-        {% if shift_schedule.id %}
-            {% trans "Update Employee Shift Schedule" %}
-        {% else %}
-            {% trans "Create Employee Shift Schedule" %}
-        {% endif %}
+        {% if shift_schedule.id %} {% trans "Update" %} {% else %} {% trans "Create" %} {% endif %} {{form.verbose_name}}
     </h2>
     <button class="oh-modal__close" aria-label="Close">
         <ion-icon name="close-outline"></ion-icon>
     </button>
 </div>
 <div class="oh-modal__dialog-body">
-    <form {% if shift_schedule.id %} hx-post="{% url 'employee-shift-schedule-update' shift_schedule.id %}"
-        hx-target="#objectUpdateModalTarget" {% else %} hx-post="{% url 'employee-shift-schedule-create' %}"
-        hx-target="#objectCreateModalTarget" {% endif %}>
+    <form hx-post="{{ request.get_full_path }}"
+        hx-target="{% if shift_schedule.id %} #objectUpdateModalTarget {% else %} #objectCreateModalTarget {% endif %}">
         {% csrf_token %} {{ form.non_field_errors}}
         {{form.as_p}}
     </form>
 </div>
 <script>
-    $(document).ready(function(e){
+    $(document).ready(function (e) {
         $("[name=is_auto_punch_out_enabled]").change();
     });
 </script>
diff --git a/base/templates/base/shift/shift_form.html b/base/templates/base/shift/shift_form.html
index b84f9fb23..bfdb32257 100644
--- a/base/templates/base/shift/shift_form.html
+++ b/base/templates/base/shift/shift_form.html
@@ -1,37 +1,22 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
-  <span class="oh-modal__dialog-title" id="createModal1ModalLabel"
-    >
-    {% if shift.id %}
-      {% trans "Update Employee Shift" %}
-    {% else %}
-      {% trans "Create Employee Shift" %}
-    {% endif %}
+    <span class="oh-modal__dialog-title" id="createModal1ModalLabel">
+        {% if shift.id %} {% trans "Update" %} {% else %} {% trans "Create" %} {% endif %} {{form.verbose_name}}
     </span>
-  <button class="oh-modal__close" aria-label="Close">
-    <ion-icon name="close-outline"></ion-icon>
-  </button>
+    <button class="oh-modal__close" aria-label="Close">
+        <ion-icon name="close-outline"></ion-icon>
+    </button>
 </div>
 <div class="oh-modal__dialog-body">
-  <form
-    {% if shift.id %}
-      hx-post="{% url 'employee-shift-update' shift.id %}"
-    {% else %}
-      hx-post="{% url 'employee-shift-create' %}?dynamic={{dynamic}}"
-    {% endif %}
-    {% if dynamic %}
-      hx-target="#dynamicCreateModalBody"
-    {% else %}
-      hx-target="#shiftForm"
-    {% endif %}
-    class="oh-profile-section"
-    >
-    {% csrf_token %} {{form.non_field_errors}}
-    {{form.as_p}}
-    <div class="oh-modal__dialog-footer p-0 mt-3">
-      <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
-        {% trans "Save" %}
-      </button>
-    </div>
-  </form>
+    <form hx-post="{{ request.get_full_path }}"
+        hx-target="{% if dynamic %} #dynamicCreateModalBody {% else %} #shiftForm {% endif %}"
+        class="oh-profile-section">
+        {% csrf_token %} {{form.non_field_errors}}
+        {{form.as_p}}
+        <div class="oh-modal__dialog-footer p-0 mt-3">
+            <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
 </div>
diff --git a/base/templates/base/work_type/work_type_form.html b/base/templates/base/work_type/work_type_form.html
index f3e65e8ee..5d744be82 100644
--- a/base/templates/base/work_type/work_type_form.html
+++ b/base/templates/base/work_type/work_type_form.html
@@ -1,37 +1,21 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
-  <span class="oh-modal__dialog-title" id="createModalLabel"
-    >
-    {% if work_type.id %}
-      {% trans "Update Work Type" %}
-    {% else %}
-      {% trans "Create Work Type" %}
-    {% endif %}
-  </span>
-  <button class="oh-modal__close" aria-label="Close">
-    <ion-icon name="close-outline"></ion-icon>
-  </button>
+    <span class="oh-modal__dialog-title" id="createModalLabel">
+        {% if work_type.id %} {% trans "Update" %} {% else %} {% trans "Create" %} {% endif %} {{form.verbose_name}}
+    </span>
+    <button class="oh-modal__close" aria-label="Close">
+        <ion-icon name="close-outline"></ion-icon>
+    </button>
 </div>
 <div class="oh-modal__dialog-body">
-  <form
-    {% if work_type.id %}
-      hx-post="{% url 'work-type-update' work_type.id %}"
-    {% else %}
-      hx-post="{% url 'work-type-create' %}?dynamic={{dynamic}}"
-    {% endif %}
-    {% if dynamic %}
-      hx-target="#dynamicCreateModal"
-    {% else %}
-      hx-target="#workTypeForm"
-    {% endif %}
-    class="oh-profile-section"
-  >
-    {% csrf_token %} {{form.non_field_errors}}
-    {{form.as_p}}
-    <div class="oh-modal__dialog-footer p-0 mt-3">
-      <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
-        {% trans "Save" %}
-      </button>
-    </div>
-  </form>
+    <form hx-post="{{ request.get_full_path }}"
+        hx-target="{% if dynamic %} #dynamicCreateModal {% else %} #workTypeForm {% endif %}" class="oh-profile-section">
+        {% csrf_token %} {{form.non_field_errors}}
+        {{form.as_p}}
+        <div class="oh-modal__dialog-footer p-0 mt-3">
+            <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
+                {% trans "Save" %}
+            </button>
+        </div>
+    </form>
 </div>
diff --git a/base/templates/shift_request/htmx/shift_request_create_form.html b/base/templates/shift_request/htmx/shift_request_create_form.html
index 76139df98..053bf65f6 100644
--- a/base/templates/shift_request/htmx/shift_request_create_form.html
+++ b/base/templates/shift_request/htmx/shift_request_create_form.html
@@ -1,7 +1,7 @@
 {% load i18n %} {% load static %}
 <div class="oh-modal__dialog-header">
     <h2 class="oh-modal__dialog-title" id="createTitle">
-		{% trans "Create Shift Request" %}
+        {% trans "Create" %} {{form.verbose_name}}
     </h2>
     <button type="button" class="oh-modal__close" aria-label="Close">
         <ion-icon name="close-outline"></ion-icon>
@@ -10,46 +10,42 @@
 
 <!-- htmx form -->
 <div class="oh-modal__dialog-body">
-  {% if messages %}
-  <div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-      <div class="oh-alert oh-alert--animated {{message.tags}}">
-        {{ message }}
-      </div>
-    </div>
-    {% endfor %}
-    <script>
-      setTimeout(function () {
-        $(".oh-modal__close").click();
-      }, 1000);
-    </script>
-  </div>
-  {% endif %}
+    {% if messages %}
+        <div class="oh-wrapper">
+            {% for message in messages %}
+            <div class="oh-alert-container">
+                <div class="oh-alert oh-alert--animated {{message.tags}}">
+                    {{ message }}
+                </div>
+            </div>
+            {% endfor %}
+            <script>
+                setTimeout(function () {
+                    $(".oh-modal__close").click();
+                }, 1000);
+            </script>
+        </div>
+    {% endif %}
 
-  <div class="oh-modal__dialog-body" style="padding: 0;">
-    <form
-      hx-post="{% url 'shift-request' %}"
-      hx-target="#objectCreateModalTarget"
-      id="addForm"
-    >
-      {{form.as_p}}
-    </form>
-  </div>
+    <div class="oh-modal__dialog-body" style="padding: 0;">
+        <form hx-post="{% url 'shift-request' %}" hx-target="#objectCreateModalTarget" id="addForm">
+            {{form.as_p}}
+        </form>
+    </div>
 </div>
 <script>
-  function toggleFunctionShiftRequestForm() {
-    if ($("#id_is_permanent_shift").is(":checked")) {
-      $("#id_requested_till").parent().hide();
-    } else {
-      $("#id_requested_till").parent().show();
+    function toggleFunctionShiftRequestForm() {
+        if ($("#id_is_permanent_shift").is(":checked")) {
+            $("#id_requested_till").parent().hide();
+        } else {
+            $("#id_requested_till").parent().show();
+        }
     }
-  }
-  toggleFunctionShiftRequestForm();
-  $(document).ready(function () {
-    $("[type=checkbox]").change(function (e) {
-      e.preventDefault();
-      toggleFunctionShiftRequestForm();
+    toggleFunctionShiftRequestForm();
+    $(document).ready(function () {
+        $("[type=checkbox]").change(function (e) {
+            e.preventDefault();
+            toggleFunctionShiftRequestForm();
+        });
     });
-  });
 </script>
diff --git a/base/templates/work_type_request/htmx/group_by.html b/base/templates/work_type_request/htmx/group_by.html
index b1e0a4bd1..fce2f2df4 100644
--- a/base/templates/work_type_request/htmx/group_by.html
+++ b/base/templates/work_type_request/htmx/group_by.html
@@ -199,9 +199,9 @@
                       {% if work_type_request.approved == False and not work_type_request.canceled %}
                       <a
                         hx-get="{% url 'work-type-request-update' work_type_request.id %}"
-                        hx-target="#workTypeRequestUpdateModalBody"
+                        hx-target="#objectUpdateModalTarget"
                         data-toggle="oh-modal-toggle"
-                        data-target="#workTypeRequestUpdateModal"
+                        data-target="#objectUpdateModal"
                         class="oh-btn oh-btn--light-bkg w-50"
                         title="{% trans 'Edit' %}"
                         ><ion-icon name="create-outline"></ion-icon
diff --git a/base/templates/work_type_request/htmx/requests.html b/base/templates/work_type_request/htmx/requests.html
index 5ecd1ef85..762497161 100755
--- a/base/templates/work_type_request/htmx/requests.html
+++ b/base/templates/work_type_request/htmx/requests.html
@@ -126,8 +126,8 @@
                                 {% if request.user.employee_get ==  work_type_request.employee_id or perms.base.change_worktyperequest or request.user|is_reportingmanager %}
                                     {% if work_type_request.approved == False and not work_type_request.canceled %}
                                         <a hx-get="{% url 'work-type-request-update' work_type_request.id %}"
-                                            hx-target='#workTypeRequestUpdateModalBody' data-toggle="oh-modal-toggle"
-                                            data-target='#workTypeRequestUpdateModal' class="oh-btn oh-btn--light-bkg w-50"
+                                            hx-target='#objectUpdateModalTarget' data-toggle="oh-modal-toggle"
+                                            data-target='#objectUpdateModal' class="oh-btn oh-btn--light-bkg w-50"
                                             title="{% trans 'Edit' %}">
                                             <ion-icon name="create-outline"></ion-icon>
                                         </a>
diff --git a/base/templates/work_type_request/htmx/work_type_request_single_view.html b/base/templates/work_type_request/htmx/work_type_request_single_view.html
index 99a575307..f871de287 100644
--- a/base/templates/work_type_request/htmx/work_type_request_single_view.html
+++ b/base/templates/work_type_request/htmx/work_type_request_single_view.html
@@ -112,9 +112,9 @@
                                     {% if can_change or can_delete %}
                                         {% if not work_type_request.approved and not work_type_request.canceled %}
                                             <a hx-get="{% url 'work-type-request-update' work_type_request.id %}"
-                                                hx-target='#workTypeRequestUpdateModalBody'
+                                                hx-target='#objectUpdateModalTarget'
                                                 data-toggle="oh-modal-toggle"
-                                                data-target='#workTypeRequestUpdateModal'
+                                                data-target='#objectUpdateModal'
                                                 class="oh-btn oh-btn--info w-50" title="{% trans 'Edit' %}">
                                                 <ion-icon name="create-outline"></ion-icon>
                                             </a>
diff --git a/base/templates/work_type_request/request_form.html b/base/templates/work_type_request/request_form.html
index 88034a65f..111843f68 100644
--- a/base/templates/work_type_request/request_form.html
+++ b/base/templates/work_type_request/request_form.html
@@ -11,13 +11,14 @@
     {% endif %}
 {% endif %}
 <div class="oh-modal__dialog-header">
-    <span class="oh-modal__dialog-title" id="objectCreateModalLabel">{% trans "Work Type Request" %}</span>
+    <span class="oh-modal__dialog-title" id="objectCreateModalLabel">{{form.verbose_name}}</span>
     <button class="oh-modal__close" aria-label="Close">
         <ion-icon name="close-outline"></ion-icon>
     </button>
 </div>
 <div class="oh-modal__dialog-body" id="formBody">
-    <form hx-post="{% url 'work-type-request' %}?{{pd}}" hx-target="#objectCreateModalTarget">
+    <form hx-post="{{ request.get_full_path }}"
+        hx-target=" {% if form.instance.id %} #objectUpdateModalTarget {% else %} #objectCreateModalTarget {% endif %}">
         {{form.as_p}}
     </form>
 </div>
diff --git a/base/templates/work_type_request/request_update_form.html b/base/templates/work_type_request/request_update_form.html
deleted file mode 100644
index 700c3cc7f..000000000
--- a/base/templates/work_type_request/request_update_form.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% load i18n %}
-{% if messages %}
-<div class="oh-alert-container">
-    {% for message in messages %}
-    <div class="oh-alert oh-alert--animated {{message.tags}}">
-          {{ message }}
-        </div>
-    {% endfor %}
-</div>
-{% endif %}
-<form
-  hx-post="{% url 'work-type-request-update' form.instance.id %}"
-  hx-target="#workTypeRequestUpdateModalBody"
->
-  {{form.as_p}}
-</form>
-<script>
-function toggleFunctionWorkTypeRequestForm(){
-  if ($("#id_is_permanent_work_type").is(":checked")) {
-    $("#id_requested_till").parent().hide();
-  } else {
-    $("#id_requested_till").parent().show();
-  }
-}
-
-  $(document).ready(function(){
-    $("[type=checkbox]").change(function (e) {
-    e.preventDefault();
-    toggleFunctionWorkTypeRequestForm();
-    });
-  })
-  toggleFunctionWorkTypeRequestForm();
-</script>
diff --git a/base/templates/work_type_request/work_type_request_view.html b/base/templates/work_type_request/work_type_request_view.html
index 53e52ce7c..3d5abf7b0 100644
--- a/base/templates/work_type_request/work_type_request_view.html
+++ b/base/templates/work_type_request/work_type_request_view.html
@@ -46,39 +46,7 @@
     </div>
 </div>
 
-<div
-    class="oh-modal"
-    id="workTypeRequestUpdateModal"
-    role="dialog"
-    aria-labelledby="workTypeRequestUpdateModal"
-    aria-hidden="true"
->
-    <div class="oh-modal__dialog">
-        <div class="oh-modal__dialog-header">
-            <h5
-                class="oh-modal__dialog-title"
-                id="workTypeRequestUpdateModalLabel"
-            >
-                {% trans "Update Request" %}
-            </h5>
-            <button
-                class="oh-modal__close--custom"
-                aria-label="Close"
-                onclick="$(this).parents().closest('.oh-modal--show').toggleClass('oh-modal--show')"
-            >
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-
-        <div
-            class="oh-modal__dialog-body"
-            id="workTypeRequestUpdateModalBody"
-        ></div>
-    </div>
-</div>
-
 <div class="oh-activity-sidebar" id="worktypeactivitySidebar" style="z-index:1000;">
-
     <div class="oh-activity-sidebar__body" id="commentContainer"></div>
 </div>
 
diff --git a/base/views.py b/base/views.py
index 76d9bd770..1a8d36c84 100644
--- a/base/views.py
+++ b/base/views.py
@@ -3877,7 +3877,7 @@ def work_type_request_update(request, work_type_request_id):
     if request.method == "POST":
         response = render(
             request,
-            "work_type_request/request_update_form.html",
+            "work_type_request/request_form.html",
             {
                 "form": form,
             },
@@ -3892,7 +3892,7 @@ def work_type_request_update(request, work_type_request_id):
                 response.content.decode("utf-8") + "<script>location.reload();</script>"
             )
 
-    return render(request, "work_type_request/request_update_form.html", {"form": form})
+    return render(request, "work_type_request/request_form.html", {"form": form})
 
 
 @login_required