diff --git a/PadelClub.xcodeproj/project.pbxproj b/PadelClub.xcodeproj/project.pbxproj
index 5429d6a..ad50f23 100644
--- a/PadelClub.xcodeproj/project.pbxproj
+++ b/PadelClub.xcodeproj/project.pbxproj
@@ -1908,7 +1908,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 62;
+				CURRENT_PROJECT_VERSION = 63;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"PadelClub/Preview Content\"";
@@ -1949,7 +1949,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = PadelClub/PadelClub.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 62;
+				CURRENT_PROJECT_VERSION = 63;
 				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 924e8df..b7a1997 100644
--- a/PadelClub/Views/Club/ClubDetailView.swift
+++ b/PadelClub/Views/Club/ClubDetailView.swift
@@ -43,6 +43,7 @@ struct ClubDetailView: View {
                             dataStore.user.clubs.append(club.id)
                         }
                         self.dataStore.saveUser()
+                        dismiss()
                     }
                 } footer: {
                     if displayContext == .lockedForEditing {
diff --git a/PadelClub/Views/Club/ClubSearchView.swift b/PadelClub/Views/Club/ClubSearchView.swift
index 6ea6d9f..beea497 100644
--- a/PadelClub/Views/Club/ClubSearchView.swift
+++ b/PadelClub/Views/Club/ClubSearchView.swift
@@ -303,7 +303,7 @@ struct ClubSearchView: View {
     }
 
     private func _importClub(clubToEdit: Club, clubMarker: ClubMarker) {
-        if clubToEdit.creator == dataStore.user.id {
+        if clubToEdit.hasBeenCreated(by: Store.main.userId) {
             if clubToEdit.name.isEmpty {
                 clubToEdit.name = clubMarker.nom.capitalized
                 clubToEdit.acronym = clubToEdit.automaticShortName().capitalized
@@ -314,17 +314,19 @@ struct ClubSearchView: View {
             clubToEdit.city = clubMarker.ville
         }
         
-        if displayContext == .addition {
+        if displayContext == .addition && clubToEdit.hasBeenCreated(by: Store.main.userId) {
             do {
                 try dataStore.clubs.addOrUpdate(instance: clubToEdit)
-                if dataStore.user.clubs.contains(where: { $0 == clubToEdit.id }) == false {
-                    dataStore.user.clubs.append(clubToEdit.id)
-                    self.dataStore.saveUser()
-                }
             } catch {
                 Logger.error(error)
             }
         }
+        
+        if dataStore.user.clubs.contains(where: { $0 == clubToEdit.id }) == false {
+            dataStore.user.clubs.append(clubToEdit.id)
+            self.dataStore.saveUser()
+        }
+        
         dismiss()
         selection?(clubToEdit)
     }