diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift
index 3fb6655..fc680c2 100644
--- a/PadelClub/Data/Tournament.swift
+++ b/PadelClub/Data/Tournament.swift
@@ -1827,8 +1827,8 @@ defer {
     func setupFederalSettings() {
         teamSorting = tournamentLevel.defaultTeamSortingType
         groupStageMatchFormat = groupStageSmartMatchFormat()
-        loserBracketMatchFormat = loserBracketSmartMatchFormat(1)
-        matchFormat = roundSmartMatchFormat(1)
+        loserBracketMatchFormat = loserBracketSmartMatchFormat(5)
+        matchFormat = roundSmartMatchFormat(5)
     }
     
     func roundSmartMatchFormat(_ roundIndex: Int) -> MatchFormat {
diff --git a/PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift b/PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift
index 1f36215..65ecfc3 100644
--- a/PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift
+++ b/PadelClub/Views/Cashier/Event/TournamentConfiguratorView.swift
@@ -29,6 +29,13 @@ struct TournamentConfigurationView: View {
             if tournament.federalLevelCategory == .unlisted {
                 tournament.federalCategory = .unlisted
                 tournament.federalAgeCategory = .unlisted
+            } else {
+                if tournament.federalCategory == .unlisted {
+                    tournament.federalCategory = .men
+                }
+                if tournament.federalAgeCategory == .unlisted {
+                    tournament.federalAgeCategory = .senior
+                }
             }
         }
         Picker(selection: $tournament.federalCategory, label: Text("Catégorie")) {