diff --git a/server/AyaNova/biz/AyaFormFieldDefinitions.cs b/server/AyaNova/biz/AyaFormFieldDefinitions.cs
index 5cf68216..80c32575 100644
--- a/server/AyaNova/biz/AyaFormFieldDefinitions.cs
+++ b/server/AyaNova/biz/AyaFormFieldDefinitions.cs
@@ -10,7 +10,7 @@ namespace AyaNova.Biz
 
     public static class AyaFormFieldDefinitions
     {
-        
+
         public static List<string> AyaFormFieldDefinitionKeys
         {
             get
@@ -121,6 +121,37 @@ namespace AyaNova.Biz
                 #endregion
             }
 
+
+            if (key == AyaType.Customer.ToString())
+            {
+                #region CUSTOMER
+                l.Add(new AyaFormFieldDefinition { TKey = "Name", FieldKey = "Name", Hideable = false });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerNotes", FieldKey = "Notes" });
+                l.Add(new AyaFormFieldDefinition { TKey = "Active", FieldKey = "Active", Hideable = false });
+                l.Add(new AyaFormFieldDefinition { TKey = "Tags", FieldKey = "Tags" });
+                l.Add(new AyaFormFieldDefinition { TKey = "Wiki", FieldKey = "Wiki" });
+                l.Add(new AyaFormFieldDefinition { TKey = "Attachments", FieldKey = "Attachments" });
+
+                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 });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom4", FieldKey = "CustomerCustom4", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom5", FieldKey = "CustomerCustom5", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom6", FieldKey = "CustomerCustom6", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom7", FieldKey = "CustomerCustom7", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom8", FieldKey = "CustomerCustom8", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom9", FieldKey = "CustomerCustom9", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom10", FieldKey = "CustomerCustom10", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom11", FieldKey = "CustomerCustom11", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom12", FieldKey = "CustomerCustom12", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom13", FieldKey = "CustomerCustom13", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom14", FieldKey = "CustomerCustom14", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom15", FieldKey = "CustomerCustom15", IsCustomField = true });
+                l.Add(new AyaFormFieldDefinition { TKey = "CustomerCustom16", FieldKey = "CustomerCustom16", IsCustomField = true });
+                return l;
+                #endregion
+            }
+
             throw new System.ArgumentOutOfRangeException($"AyaFormFieldDefinitions: {key} is not valid");
 
         }