diff --git a/bsmd.database/CREW.cs b/bsmd.database/CREW.cs
index 779f8f53..78041839 100644
--- a/bsmd.database/CREW.cs
+++ b/bsmd.database/CREW.cs
@@ -114,13 +114,14 @@ namespace bsmd.database
 
         [ShowReport]
         [ReportDisplayName("Issuing state")]
-        [Validation(ValidationCode.OPTIONAL_FLAG_CODE)]
+        [Validation(ValidationCode.FLAG_CODE)]
         [MaxLength(2)]
         [ENI2Validation]
         public string CrewMemberIdentityDocumentIssuingState { get; set; }
 
         [ShowReport]
         [ReportDisplayName("Expiry date")]
+        [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
         public DateTime? CrewMemberIdentityDocumentExpiryDate { get; set; }
 
diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs
index 4131f729..f367423b 100644
--- a/bsmd.database/PAS.cs
+++ b/bsmd.database/PAS.cs
@@ -118,13 +118,14 @@ namespace bsmd.database
 
         [ShowReport]
         [ReportDisplayName("Issuing state")]
-        [Validation(ValidationCode.OPTIONAL_FLAG_CODE)]
+        [Validation(ValidationCode.FLAG_CODE)]
         [ENI2Validation]
         public string PassengerIdentityDocumentIssuingState { get; set; }
 
 
         [ShowReport]
         [ReportDisplayName("Expiry date")]
+        [Validation(ValidationCode.NOT_NULL)]
         [ENI2Validation]
         public DateTime? PassengerIdentityDocumentExpiryDate { get; set; }