diff --git a/app/Models/Payment.php b/app/Models/Payment.php
index 8302c53430bb..d43cacf6f043 100644
--- a/app/Models/Payment.php
+++ b/app/Models/Payment.php
@@ -314,9 +314,9 @@ class Payment extends BaseModel
         return $this->createClientDate($this->date, $this->client->timezone()->name)->format($date_format->format);
     }
 
-    public static function badgeForStatus(int $status): string
+    public function badgeForStatus(): string
     {
-        switch ($status) {
+        switch ($this->status_id) {
             case self::STATUS_PENDING:
                 return '<h6><span class="badge badge-secondary">'.ctrans('texts.payment_status_1').'</span></h6>';
             case self::STATUS_CANCELLED:
@@ -324,6 +324,10 @@ class Payment extends BaseModel
             case self::STATUS_FAILED:
                 return '<h6><span class="badge badge-danger">'.ctrans('texts.payment_status_3').'</span></h6>';
             case self::STATUS_COMPLETED:
+
+                if($this->amount > $this->applied)
+                    return '<h6><span class="badge badge-info">' . ctrans('texts.partially_unapplied') . '</span></h6>';
+
                 return '<h6><span class="badge badge-info">'.ctrans('texts.payment_status_4').'</span></h6>';
             case self::STATUS_PARTIALLY_REFUNDED:
                 return '<h6><span class="badge badge-success">'.ctrans('texts.payment_status_5').'</span></h6>';
diff --git a/resources/views/portal/ninja2020/components/livewire/payments-table.blade.php b/resources/views/portal/ninja2020/components/livewire/payments-table.blade.php
index 7d3f0a60a15d..c4ae5672ebb8 100644
--- a/resources/views/portal/ninja2020/components/livewire/payments-table.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/payments-table.blade.php
@@ -66,7 +66,7 @@
                             {{ \Illuminate\Support\Str::limit($payment->transaction_reference, 35) }}
                         </td>
                         <td class="px-6 py-4 whitespace-nowrap text-sm leading-5 text-gray-500">
-                            {!! \App\Models\Payment::badgeForStatus($payment->status_id) !!}
+                            {!! $payment->badgeForStatus() !!}
                         </td>
                         <td class="px-6 py-4 whitespace-nowrap flex items-center justify-end text-sm leading-5 font-medium">
                             <a href="{{ route('client.payments.show', $payment->hashed_id) }}" class="text-blue-600 hover:text-indigo-900 focus:outline-none focus:underline">
diff --git a/resources/views/portal/ninja2020/payments/show.blade.php b/resources/views/portal/ninja2020/payments/show.blade.php
index a0604b92efe8..9c9e51cbd6ab 100644
--- a/resources/views/portal/ninja2020/payments/show.blade.php
+++ b/resources/views/portal/ninja2020/payments/show.blade.php
@@ -21,7 +21,7 @@
                                 {{ ctrans('texts.status') }}
                             </dt>
                             <div class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                {!! \App\Models\Payment::badgeForStatus($payment->status_id) !!}
+                                {!! $payment->badgeForStatus() !!}
                             </div>
                         </div>
                     @endif