diff --git a/employee/forms.py b/employee/forms.py
index 6f542d954..148c3e710 100644
--- a/employee/forms.py
+++ b/employee/forms.py
@@ -593,6 +593,18 @@ class BonusPointRedeemForm(ModelForm):
         model = BonusPoint
         fields = ["points"]
 
+    def clean(self):
+        cleaned_data = super().clean()
+        available_points = BonusPoint.objects.filter(
+            employee_id=self.instance.employee_id
+        ).first()
+        if available_points.points < cleaned_data["points"]:
+            raise forms.ValidationError({"points": "Not enough bonus points to redeem"})
+        if cleaned_data["points"] <= 0:
+            raise forms.ValidationError(
+                {"points": "Points must be greater than zero to redeem."}
+            )
+
 
 class DisciplinaryActionForm(ModelForm):
     class Meta:
diff --git a/employee/templates/tabs/forms/redeem_points_form.html b/employee/templates/tabs/forms/redeem_points_form.html
index 2bf849aa7..3e11f0552 100644
--- a/employee/templates/tabs/forms/redeem_points_form.html
+++ b/employee/templates/tabs/forms/redeem_points_form.html
@@ -10,24 +10,25 @@
 >
     <form
         class="oh-general__tab-target oh-profile-section"
-        action="{% url 'redeem-points' employee.id %}"
+        hx-post="{% url 'redeem-points' employee.id %}"
+        hx-target="#objectDetailsModalW25Target"
         method="post"
     >
         {% csrf_token %}
-        <div class="row mb-4">
+        <div class="row">
             <div class="col-12 col-sm-12 col-md-12 col-lg-12">
                 <label
                     class="oh-label"
                     for="id_points"
-                    title="{{form.points.help_text|safe}}"
                     >{% trans "Points :" %}</label
                 >
                 <div
-                    class="w-100 d-flex"
+                    class="w-100 d-flex mb-3"
                     style="align-items: center; justify-content: center !important"
                 >
-                    {{form.points}} {{form.points.errors}}
+                    {{form.points}} 
                 </div>
+                {{form.points.errors}}
             </div>
         </div>
         <div class="d-flex flex-row-reverse">
diff --git a/employee/views.py b/employee/views.py
index 69604586c..ec3a0f0fd 100755
--- a/employee/views.py
+++ b/employee/views.py
@@ -3265,6 +3265,7 @@ def redeem_points(request, emp_id):
     """
     user = Employee.objects.get(id=emp_id)
     form = BonusPointRedeemForm()
+    form.instance.employee_id =user
     amount_for_bonus_point = (
         EncashmentGeneralSettings.objects.first().bonus_amount
         if EncashmentGeneralSettings.objects.first()
@@ -3272,6 +3273,7 @@ def redeem_points(request, emp_id):
     )
     if request.method == "POST":
         form = BonusPointRedeemForm(request.POST)
+        form.instance.employee_id =user
         if form.is_valid():
             form.save(commit=False)
             points = form.cleaned_data["points"]