diff --git a/as-talange-core/src/main/java/com/astalange/core/service/CategorieService.java b/as-talange-core/src/main/java/com/astalange/core/service/CategorieService.java
index dae2fe7..9110bb5 100644
--- a/as-talange-core/src/main/java/com/astalange/core/service/CategorieService.java
+++ b/as-talange-core/src/main/java/com/astalange/core/service/CategorieService.java
@@ -138,14 +138,13 @@ public class CategorieService {
                 newDotation.setLicence(licence);
                 newDotation.setEquipement(ce.getEquipement());
                 boolean isMaillot = "Maillot".equalsIgnoreCase(ce.getEquipement().getNom());
-                boolean isNouvelleAndU11 = false;
+                boolean isNouvelle = false;
                 if (licence.getTypeDemande() != null && 
                     (licence.getTypeDemande().equalsIgnoreCase("Nouvelle demande") || licence.getTypeDemande().equalsIgnoreCase("NOUVELLE")) && 
-                    licence.getCategorie() != null && 
-                    licence.getCategorie().isU11OrBelow()) {
-                    isNouvelleAndU11 = true;
+                    licence.getCategorie() != null) {
+                    isNouvelle = true;
                 }
-                newDotation.setChoisi(ce.getObligatoire() || (isMaillot && isNouvelleAndU11)); // Checked if obligatoire or if it's a new registration for U11 or below
+                newDotation.setChoisi(ce.getObligatoire() || (isMaillot && isNouvelle)); // Checked if obligatoire or if it's a new registration
                 newDotation.setFourni(false);
                 newDotation.setTaille("");
                 newDotation.setNumero("");
diff --git a/as-talange-web/src/main/java/com/astalange/web/controller/PublicInscriptionController.java b/as-talange-web/src/main/java/com/astalange/web/controller/PublicInscriptionController.java
index 7003cff..52611d7 100644
--- a/as-talange-web/src/main/java/com/astalange/web/controller/PublicInscriptionController.java
+++ b/as-talange-web/src/main/java/com/astalange/web/controller/PublicInscriptionController.java
@@ -133,9 +133,9 @@ public class PublicInscriptionController {
                 if (!categories.isEmpty()) {
                     Categorie cat = categories.get(0);
                     if (cat.getTarifBase() != null) {
-                        BigDecimal prixMaillot = BigDecimal.ZERO;
-                        if (cat.isU11OrBelow()) {
-                            prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                        BigDecimal prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                        if (prixMaillot == null) {
+                            prixMaillot = BigDecimal.ZERO;
                         }
                         BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
                         tarifStr = tarifTotal.intValue() + " €";
@@ -175,9 +175,9 @@ public class PublicInscriptionController {
 
             Categorie cat = categories.get(0);
             if (cat.getTarifBase() != null) {
-                BigDecimal prixMaillot = BigDecimal.ZERO;
-                if (cat.isU11OrBelow()) {
-                    prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                BigDecimal prixMaillot = cat.getEquipementPrixByNom("Maillot");
+                if (prixMaillot == null) {
+                    prixMaillot = BigDecimal.ZERO;
                 }
                 BigDecimal tarifTotal = cat.getTarifBase().add(prixMaillot);
                 return tarifTotal.intValue() + " €";