diff --git a/base/templates/base/audit_tag/employee_account_block_unblock.html b/base/templates/base/audit_tag/employee_account_block_unblock.html
index 7b67f7a54..387cca63f 100644
--- a/base/templates/base/audit_tag/employee_account_block_unblock.html
+++ b/base/templates/base/audit_tag/employee_account_block_unblock.html
@@ -3,16 +3,18 @@
 <div class="oh-inner-sidebar-content__header mt-4">
     <h2 class="oh-inner-sidebar-content__title">{% trans 'Employee Account Block/Unblock' %}</h2>
 </div>
-<form action="{% url 'enable-account-block-unblock' %}" method="post">
+<form hx-post="{% url 'enable-account-block-unblock' %}" hx-swap="none" hx-trigger="change from:#enableBlockUnblock"
+    hx-on-htmx-after-request="setTimeout(() => { reloadMessage(); }, 70);">
     {% csrf_token %}
-  <div class="oh-label__info" for="enable_block_unblock">
-    <label class="oh-label" for="enable_block_unblock">{% trans "Restrict Login Account" %}</label>
-    <span class="oh-info mr-2" title="{% trans "By enabling this feature, you can block or unblock an employee's account." %}">
-    </span>
-  </div>
-  <div class="oh-switch p-3">
-    <input type="checkbox"class="oh-switch__checkbox" name="enable_block_account" onchange="$(this).closest('form').find('input[type=submit]').click()" {% if enabled_block_unblock %} checked{% endif %} />
-  </div>
-  <input type="submit" hidden />
+    <div class="oh-label__info" for="enable_block_unblock">
+        <label class="oh-label" for="enable_block_unblock">{% trans "Restrict Login Account" %}</label>
+        <span class="oh-info mr-2" title="{% trans 'By enabling this feature, you can block or unblock an employee account.' %}">
+        </span>
+    </div>
+    <div class="oh-switch p-3">
+        <input type="checkbox" class="oh-switch__checkbox" name="enable_block_account" id="enableBlockUnblock"
+            {% if enabled_block_unblock %} checked {% endif %} />
+    </div>
+    <input type="submit" hidden />
 </form>
 <div class="oh-inner-sidebar-content__footer"></div>
diff --git a/base/templates/base/dynamic_pagination/pagination_settings.html b/base/templates/base/dynamic_pagination/pagination_settings.html
index f9e891615..e6637be4f 100644
--- a/base/templates/base/dynamic_pagination/pagination_settings.html
+++ b/base/templates/base/dynamic_pagination/pagination_settings.html
@@ -1,22 +1,21 @@
 {% load i18n %}
 
-<form action="{% url 'pagination-settings-view' %}" class='settings-label mb-1' method="post">
-  {% csrf_token %}
-  <div class="oh-inner-sidebar-content__header mt-4">
-    <h2 class="oh-inner-sidebar-content__title">{% trans "Default Records Per Page" %}</h2>
-  </div>
-  <div class="oh-label__info" for="pagination">
-    <label class="oh-label" for="pagination">{% trans "Pagination" %}</label>
-    <span class="oh-info mr-2" title='{% trans "Default pagination for all views." %}'>
-    </span>
-  </div>
-  <input type="number" name="pagination" value="{{pagination_form.instance.pagination}}" class="oh-input w-25" placeholder="Pagination" required="" id="id_pagination">
-  <button
-    style="display: inline;margin-left: 10px;"
-    type="submit"
-    class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
-    >
-    {% trans "Save Changes" %}
-  </button>
-  <div class="oh-inner-sidebar-content__footer"></div>
+<form hx-post="{% url 'pagination-settings-view' %}" class='settings-label mb-1' hx-swap="none"
+    hx-on-htmx-after-request="setTimeout(() => { reloadMessage(); }, 100);">
+    {% csrf_token %}
+    <div class="oh-inner-sidebar-content__header mt-4">
+        <h2 class="oh-inner-sidebar-content__title">{% trans "Default Records Per Page" %}</h2>
+    </div>
+    <div class="oh-label__info" for="pagination">
+        <label class="oh-label" for="pagination">{% trans "Pagination" %}</label>
+        <span class="oh-info mr-2" title='{% trans "Default pagination for all views." %}'>
+        </span>
+    </div>
+    <input type="number" name="pagination" value="{{pagination_form.instance.pagination}}" class="oh-input w-25"
+        placeholder="Pagination" required="" id="id_pagination">
+    <button style="display: inline;margin-left: 10px;" type="submit"
+        class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp">
+        {% trans "Save Changes" %}
+    </button>
+    <div class="oh-inner-sidebar-content__footer"></div>
 </form>
diff --git a/base/views.py b/base/views.py
index 870c55876..90cd0ea68 100644
--- a/base/views.py
+++ b/base/views.py
@@ -5142,21 +5142,27 @@ def history_field_settings(request):
     return redirect(general_settings)
 
 
+@login_required
+@permission_required("horilla_audit.change_accountblockunblock")
 def enable_account_block_unblock(request):
     if request.method == "POST":
-        enabled = request.POST.get("enable_block_account")
-        if enabled == "on":
-            enabled = True
-        else:
-            enabled = False
-        if AccountBlockUnblock.objects.exists():
-            instance = AccountBlockUnblock.objects.first()
+        enabled = request.POST.get("enable_block_account") == "on"
+        instance = AccountBlockUnblock.objects.first()
+        if instance:
             instance.is_enabled = enabled
-            messages.success(request, _("Settings updated."))
             instance.save()
         else:
             AccountBlockUnblock.objects.create(is_enabled=enabled)
+        messages.success(
+            request,
+            _(
+                f"Account block/unblock setting has been {'enabled' if enabled else 'disabled'}."
+            ),
+        )
+        if request.META.get("HTTP_HX_REQUEST"):
+            return HttpResponse()
         return redirect(general_settings)
+    return HttpResponse(status=405)
 
 
 @login_required
@@ -6111,6 +6117,8 @@ def pagination_settings_view(request):
             if pagination_form.is_valid():
                 pagination_form.save()
                 messages.success(request, _("Default pagination updated."))
+    if request.META.get("HTTP_HX_REQUEST"):
+        return HttpResponse()
     return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))