diff --git a/provision/700_crm/1100_modules.yaml b/provision/700_crm/1100_modules.yaml
index f78b2c054..520163011 100644
--- a/provision/700_crm/1100_modules.yaml
+++ b/provision/700_crm/1100_modules.yaml
@@ -1769,6 +1769,7 @@ modules:
           - Fax
           - Letter
           - Visit
+          - State change
       File:
         label: File
         kind: File
@@ -5658,7 +5659,7 @@ modules:
         kind: String
         private: true
         expressions:
-          valueExpr: trim(FirstName + " " + LastName)
+          valueExpr: "trim((FirstName ? FirstName : \"\") + \" \" + (LastName ? LastName : \"\"))"
       CampaignId:
         label: Campaign
         kind: Record