diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj
index 0850ef8..aa81921 100644
--- a/PadelClub.xcodeproj/project.pbxproj
+++ b/PadelClub.xcodeproj/project.pbxproj
@@ -1894,7 +1894,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 85;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@@ -1937,7 +1937,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 83;
+				CURRENT_PROJECT_VERSION = 85;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
 				DEVELOPMENT_TEAM = BQ3Y44M3Q6;
diff --git a/PadelClub/Views/Club/ClubDetailView.swift b/PadelClub/Views/Club/ClubDetailView.swift
index 91e95cb..f79769f 100644
--- a/PadelClub/Views/Club/ClubDetailView.swift
+++ b/PadelClub/Views/Club/ClubDetailView.swift
@@ -86,12 +86,14 @@ struct ClubDetailView: View {
                             .onSubmit(of: .text) {
                                 if club.acronym.count > 10 {
                                     club.acronym = String(club.acronym.prefix(10))
+                                } else if club.acronym.count == 0 {
+                                    acronymMode = .automatic
                                 }
                             }
                     }
                 } label: {
                     VStack(alignment: .leading, spacing: 0) {
-                        Text("Nom court (10 caractères max.)").foregroundStyle(.secondary).font(.caption)
+                        Text("Nom court (10 lettres max.)").foregroundStyle(.secondary).font(.caption)
                         Menu {
                             Section {
                                 ForEach(Club.AcronymMode.allCases, id: \.self) { option in
@@ -116,6 +118,8 @@ struct ClubDetailView: View {
                     focusedField = ._acronym
                     if acronymMode == .custom {
                         club.acronym = ""
+                    } else {
+                        club.acronym = club.automaticShortName().uppercased()
                     }
                 }
             } footer: {
diff --git a/PadelClub/Views/Club/ClubSearchView.swift b/PadelClub/Views/Club/ClubSearchView.swift
index 01ebe1f..6d884fb 100644
--- a/PadelClub/Views/Club/ClubSearchView.swift
+++ b/PadelClub/Views/Club/ClubSearchView.swift
@@ -324,7 +324,7 @@ struct ClubSearchView: View {
         if clubToEdit.hasBeenCreated(by: StoreCenter.main.userId) {
             if clubToEdit.name.isEmpty {
                 clubToEdit.name = clubMarker.nom.capitalized
-                clubToEdit.acronym = clubToEdit.automaticShortName().capitalized
+                clubToEdit.acronym = clubToEdit.automaticShortName().uppercased()
             }
             clubToEdit.code = clubMarker.clubID
             clubToEdit.latitude = clubMarker.lat