diff --git a/PadelClub/Data/Club.swift b/PadelClub/Data/Club.swift
index 8c64362..f52bc18 100644
--- a/PadelClub/Data/Club.swift
+++ b/PadelClub/Data/Club.swift
@@ -89,7 +89,7 @@ extension Club {
     }
     
     func hasBeenCreated(by creatorId: String?) -> Bool {
-        return creatorId == creator || creator == nil
+        return creatorId == creator || creator == nil || self.relatedUser == creatorId
     }
     
     func isFavorite() -> Bool {
@@ -108,7 +108,9 @@ extension Club {
         if let club {
             return club
         } else {
-            return Club(creator: StoreCenter.main.userId, name: name, code: code, city: city, zipCode: zipCode)
+            let club = Club(creator: StoreCenter.main.userId, name: name, code: code, city: city, zipCode: zipCode)
+            club.relatedUser = StoreCenter.main.userId
+            return club
         }
     }
     
diff --git a/PadelClub/Data/Event.swift b/PadelClub/Data/Event.swift
index d45ff18..c2e9709 100644
--- a/PadelClub/Data/Event.swift
+++ b/PadelClub/Data/Event.swift
@@ -14,7 +14,7 @@ final class Event: BaseEvent {
     
     internal init(creator: String? = nil, club: String? = nil, name: String? = nil, tenupId: String? = nil) {
         super.init(creator: creator, club: club, name: name, tenupId: tenupId)
-        
+        self.relatedUser = creator
     }
     
     required init(from decoder: Decoder) throws {