diff --git a/registration/views.py b/registration/views.py
index e0dc265..b63ef76 100644
--- a/registration/views.py
+++ b/registration/views.py
@@ -460,7 +460,7 @@ class PaymentUpdateView(LoginRequiredMixin, UpdateView):
         context['title'] = _("Update payment")
         # Grouping is only possible if there isn't any validated payment in the team
         context['can_group'] = all(p.valid is False for reg in self.object.team.students.all()
-                                   for p in reg.payments.filter(valid=self.object.valid).all())
+                                   for p in reg.payments.filter(final=self.object.final).all())
         context['bank_transfer_form'] = PaymentForm(payment_type='bank_transfer',
                                                     data=self.request.POST or None,
                                                     instance=self.object)
@@ -504,7 +504,7 @@ class PaymentUpdateGroupView(LoginRequiredMixin, DetailView):
             return self.handle_no_permission()
 
         if any(p.valid is not False for reg in payment.team.students.all()
-               for p in reg.payments.filter(valid=payment.valid).all()):
+               for p in reg.payments.filter(final=payment.final).all()):
             raise PermissionDenied(_("Since one payment is already validated, or pending validation, "
                                      "grouping is not possible."))
         return super().dispatch(request, *args, **kwargs)