diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs
index 8faa82c4..ce6daba5 100644
--- a/server/AyaNova/biz/CustomerBiz.cs
+++ b/server/AyaNova/biz/CustomerBiz.cs
@@ -296,6 +296,9 @@ namespace AyaNova.Biz
                 }
             }
 
+            if (proposedObj.ContractId != null)
+                if (proposedObj.ContractExpires == null)
+                    AddError(ApiErrorCode.VALIDATION_REQUIRED, "ContractExpires");
 
             if (proposedObj.BillHeadOffice && (proposedObj.HeadOfficeId == null || proposedObj.HeadOfficeId == 0))
             {
@@ -379,9 +382,9 @@ namespace AyaNova.Biz
         private async Task PopulateVizFields(Customer o)
         {
             if (o.HeadOfficeId != null)
-                o.HeadOfficeViz = await ct.HeadOffice.AsNoTracking().Where(x=>x.Id==o.HeadOfficeId).Select(x => x.Name).FirstOrDefaultAsync();
+                o.HeadOfficeViz = await ct.HeadOffice.AsNoTracking().Where(x => x.Id == o.HeadOfficeId).Select(x => x.Name).FirstOrDefaultAsync();
             if (o.ContractId != null)
-                o.ContractViz = await ct.Contract.AsNoTracking().Where(x=>x.Id==o.ContractId).Select(x => x.Name).FirstOrDefaultAsync();
+                o.ContractViz = await ct.Contract.AsNoTracking().Where(x => x.Id == o.ContractId).Select(x => x.Name).FirstOrDefaultAsync();
         }
 
 
diff --git a/server/AyaNova/biz/HeadOfficeBiz.cs b/server/AyaNova/biz/HeadOfficeBiz.cs
index 2ce5f1f6..83d7567d 100644
--- a/server/AyaNova/biz/HeadOfficeBiz.cs
+++ b/server/AyaNova/biz/HeadOfficeBiz.cs
@@ -280,6 +280,9 @@ namespace AyaNova.Biz
                 }
             }
 
+            if (proposedObj.ContractId != null)
+                if (proposedObj.ContractExpires == null)
+                    AddError(ApiErrorCode.VALIDATION_REQUIRED, "ContractExpires");
 
             //Any form customizations to validate?
             var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(z => z.FormKey == AyaType.HeadOffice.ToString());
diff --git a/server/AyaNova/biz/UnitBiz.cs b/server/AyaNova/biz/UnitBiz.cs
index bc8df0ba..ed095550 100644
--- a/server/AyaNova/biz/UnitBiz.cs
+++ b/server/AyaNova/biz/UnitBiz.cs
@@ -256,6 +256,10 @@ namespace AyaNova.Biz
                     AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, "Serial", "no two units can have the same serial and same unitmodel");
                 }
             }
+            
+            if (proposedObj.ContractId != null)
+                if (proposedObj.ContractExpires == null)
+                    AddError(ApiErrorCode.VALIDATION_REQUIRED, "ContractExpires");
 
             //Any form customizations to validate?
             var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(z => z.FormKey == AyaType.Unit.ToString());