diff --git a/PadelClub/Views/Calling/CallMessageCustomizationView.swift b/PadelClub/Views/Calling/CallMessageCustomizationView.swift
index 1c9c7ef..8b54d0e 100644
--- a/PadelClub/Views/Calling/CallMessageCustomizationView.swift
+++ b/PadelClub/Views/Calling/CallMessageCustomizationView.swift
@@ -31,7 +31,7 @@ struct CallMessageCustomizationView: View {
         self.tournament = tournament
         _customCallMessageBody = State(wrappedValue: DataStore.shared.user.summonsMessageBody ?? (DataStore.shared.user.summonsUseFullCustomMessage ? "" : ContactType.defaultCustomMessage))
         _customCallMessageSignature = State(wrappedValue: DataStore.shared.user.getSummonsMessageSignature() ?? DataStore.shared.user.defaultSignature(tournament))
-        _customClubName = State(wrappedValue: tournament.clubName ?? "Lieu du tournoi")
+        _customClubName = State(wrappedValue: tournament.customClubName ?? tournament.clubName ??  "Lieu du tournoi")
         _summonsAvailablePaymentMethods = State(wrappedValue: DataStore.shared.user.summonsAvailablePaymentMethods ?? ContactType.defaultAvailablePaymentMethods)
     }
     
@@ -235,13 +235,13 @@ struct CallMessageCustomizationView: View {
         if let eventClub = tournament.eventObject()?.clubObject() {
             let hasBeenCreated: Bool = eventClub.hasBeenCreated(by: StoreCenter.main.userId)
             Section {
-                TextField("Nom du club", text: $customClubName, axis: .vertical)
+                TextField("Nom du club", text: $customClubName)
                     .autocorrectionDisabled()
                     .focused($focusedField, equals: .clubName)
                     .onSubmit {
-                        eventClub.name = customClubName
+                        tournament.customClubName = customClubName.prefixTrimmed(100)
                         do {
-                            try dataStore.clubs.addOrUpdate(instance: eventClub)
+                            try dataStore.tournaments.addOrUpdate(instance: tournament)
                         } catch {
                             Logger.error(error)
                         }