diff --git a/server/AyaNova/biz/AyaFormFieldDefinitions.cs b/server/AyaNova/biz/AyaFormFieldDefinitions.cs
index e73535a3..ac669e93 100644
--- a/server/AyaNova/biz/AyaFormFieldDefinitions.cs
+++ b/server/AyaNova/biz/AyaFormFieldDefinitions.cs
@@ -129,6 +129,23 @@ namespace AyaNova.Biz
                     l.Add(new AyaFormFieldDefinition { TKey = "Wiki", FieldKey = "Wiki" });
                     l.Add(new AyaFormFieldDefinition { TKey = "Attachments", FieldKey = "Attachments" });
 
+                    l.Add(new AyaFormFieldDefinition { TKey = "WebAddress", FieldKey = "WebAddress" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerPopUpNotes", FieldKey = "PopUpNotes" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerBillHeadOffice", FieldKey = "BillHeadOffice" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "HeadOffice", FieldKey = "HeadOfficeID" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerTechNotes", FieldKey = "TechNotes" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerAccountNumber", FieldKey = "AccountNumber" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "UsesBanking", FieldKey = "UsesBanking" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "Contract", FieldKey = "ContractID" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "ContractExpires", FieldKey = "ContractExpires" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "WorkOrderTemplate", FieldKey = "DefaultServiceTemplateID" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerPhone1", FieldKey = "Phone1" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerPhone2", FieldKey = "Phone2" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerPhone3", FieldKey = "Phone3" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerPhone4", FieldKey = "Phone4" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerPhone5", FieldKey = "Phone5" });
+                    l.Add(new AyaFormFieldDefinition { TKey = "CustomerEmail", FieldKey = "EmailAddress" });
+
                     l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom1", FieldKey = "CustomerCustom1", IsCustomField = true });
                     l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom2", FieldKey = "CustomerCustom2", IsCustomField = true });
                     l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom3", FieldKey = "CustomerCustom3", IsCustomField = true });
diff --git a/server/AyaNova/biz/CustomerBiz.cs b/server/AyaNova/biz/CustomerBiz.cs
index 298c41d3..b0e92bdf 100644
--- a/server/AyaNova/biz/CustomerBiz.cs
+++ b/server/AyaNova/biz/CustomerBiz.cs
@@ -220,6 +220,11 @@ namespace AyaNova.Biz
             }
 
 
+            if(proposedObj.BillHeadOffice && (proposedObj.HeadOfficeID==null || proposedObj.HeadOfficeID==0)){
+                 AddError(ApiErrorCode.VALIDATION_REQUIRED, "HeadOfficeID");
+            }
+
+
             //Any form customizations to validate?
             var FormCustomization = await ct.FormCustom.AsNoTracking().SingleOrDefaultAsync(z => z.FormKey == AyaType.Customer.ToString());
             if (FormCustomization != null)