diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index c1c494e..3c49445 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -936,8 +936,9 @@ namespace AyaNova.PlugIn.V8
                 if (c.ContractID != Guid.Empty)
                 {
                     d.contractId = Getv7v8IdMap(c.ContractID, "Contract for Client " + d.name);
+                    d.contractExpires = c.ContractExpires;
                 }
-                d.contractExpires = c.ContractExpires;//?? dates
+                
                 //todo d.defaultServiceTemplateId = c.defaultservicetemplateid
                 d.phone1 = c.Phone1;
                 d.phone2 = c.Phone2;
@@ -1141,9 +1142,10 @@ namespace AyaNova.PlugIn.V8
                 if (c.ContractID != Guid.Empty)
                 {
                     d.contractId = Getv7v8IdMap(c.ContractID, "Contract for Head Office " + d.name);
+                    d.contractExpires = c.ContractExpires;
                 }
 
-                d.contractExpires = c.ContractExpires;//?? dates
+                
                 d.phone1 = c.Phone1;
                 d.phone2 = c.Phone2;
                 d.phone3 = c.Phone3;