diff --git a/PadelClub/Data/Tournament.swift b/PadelClub/Data/Tournament.swift
index bde30a8..b710840 100644
--- a/PadelClub/Data/Tournament.swift
+++ b/PadelClub/Data/Tournament.swift
@@ -246,7 +246,7 @@ final class Tournament : ModelObject, Storable {
         try container.encode(groupStageSortMode, forKey: ._groupStageSortMode)
         try container.encode(groupStageCount, forKey: ._groupStageCount)
         
-        try container.encodeOptional(rankSourceDate, forKey: ._rankSourceDate)
+        try container.encode(rankSourceDate, forKey: ._rankSourceDate)
         
         try container.encode(dayDuration, forKey: ._dayDuration)
         try container.encode(teamCount, forKey: ._teamCount)
@@ -255,7 +255,7 @@ final class Tournament : ModelObject, Storable {
         try container.encode(federalLevelCategory, forKey: ._federalLevelCategory)
         try container.encode(federalAgeCategory, forKey: ._federalAgeCategory)
         
-        try container.encodeOptional(closedRegistrationDate, forKey: ._closedRegistrationDate)
+        try container.encode(closedRegistrationDate, forKey: ._closedRegistrationDate)
         
         try container.encode(groupStageAdditionalQualified, forKey: ._groupStageAdditionalQualified)
         try container.encode(courtCount, forKey: ._courtCount)
diff --git a/PadelClub/Data/User.swift b/PadelClub/Data/User.swift
index 251d750..06ff5bd 100644
--- a/PadelClub/Data/User.swift
+++ b/PadelClub/Data/User.swift
@@ -185,23 +185,23 @@ class User: ModelObject, UserBase, Storable {
         try container.encode(email, forKey: ._email)
         try container.encode(clubs, forKey: ._clubs)
         
-        try container.encodeOptional(umpireCode, forKey: ._umpireCode)
-        try container.encodeOptional(licenceId, forKey: ._licenceId)
+        try container.encode(umpireCode, forKey: ._umpireCode)
+        try container.encode(licenceId, forKey: ._licenceId)
         try container.encode(firstName, forKey: ._firstName)
         try container.encode(lastName, forKey: ._lastName)
-        try container.encodeOptional(phone, forKey: ._phone)
-        try container.encodeOptional(country, forKey: ._country)
-        try container.encodeOptional(summonsMessageBody, forKey: ._summonsMessageBody)
-        try container.encodeOptional(summonsMessageSignature, forKey: ._summonsMessageSignature)
-        try container.encodeOptional(summonsAvailablePaymentMethods, forKey: ._summonsAvailablePaymentMethods)
+        try container.encode(phone, forKey: ._phone)
+        try container.encode(country, forKey: ._country)
+        try container.encode(summonsMessageBody, forKey: ._summonsMessageBody)
+        try container.encode(summonsMessageSignature, forKey: ._summonsMessageSignature)
+        try container.encode(summonsAvailablePaymentMethods, forKey: ._summonsAvailablePaymentMethods)
         try container.encode(summonsDisplayFormat, forKey: ._summonsDisplayFormat)
         try container.encode(summonsDisplayEntryFee, forKey: ._summonsDisplayEntryFee)
         try container.encode(summonsUseFullCustomMessage, forKey: ._summonsUseFullCustomMessage)
         
-        try container.encodeOptional(matchFormatsDefaultDuration, forKey: ._matchFormatsDefaultDuration)
-        try container.encodeOptional(bracketMatchFormatPreference, forKey: ._bracketMatchFormatPreference)
-        try container.encodeOptional(groupStageMatchFormatPreference, forKey: ._groupStageMatchFormatPreference)
-        try container.encodeOptional(loserBracketMatchFormatPreference, forKey: ._loserBracketMatchFormatPreference)
+        try container.encode(matchFormatsDefaultDuration, forKey: ._matchFormatsDefaultDuration)
+        try container.encode(bracketMatchFormatPreference, forKey: ._bracketMatchFormatPreference)
+        try container.encode(groupStageMatchFormatPreference, forKey: ._groupStageMatchFormatPreference)
+        try container.encode(loserBracketMatchFormatPreference, forKey: ._loserBracketMatchFormatPreference)
         try container.encode(deviceId, forKey: ._deviceId)
         
         try container.encode(loserBracketMode, forKey: ._loserBracketMode)