diff --git a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
index 264a29f..7d8f361 100644
--- a/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
+++ b/modules/opencase_defaults/config/optional/core.entity_form_display.oc_actor.client.default.yml
@@ -1,3 +1,4 @@
+uuid: 5715def9-7c66-4fd5-bd33-cbd0d817a8f7
 langcode: en
 status: true
 dependencies:
@@ -21,13 +22,23 @@ dependencies:
   module:
     - datetime
     - file
+_core:
+  default_config_hash: 90BCsdjSFMMiSp2Da3WhMM2sOUliF433LfErYxVCrgk
 id: oc_actor.client.default
 targetEntityType: oc_actor
 bundle: client
 mode: default
 content:
-  field_asylum_status:
+  email:
+    type: string_textfield
     weight: 3
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_asylum_status:
+    weight: 11
     settings: {  }
     third_party_settings: {  }
     type: options_select
@@ -41,20 +52,20 @@ content:
     type: string_textfield
     region: content
   field_confidentiality_form:
-    weight: 12
+    weight: 20
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
     type: file_generic
     region: content
   field_date_of_birth:
-    weight: 0
+    weight: 8
     settings: {  }
     third_party_settings: {  }
     type: datetime_default
     region: content
   field_dependants:
-    weight: 9
+    weight: 17
     settings:
       size: 60
       placeholder: ''
@@ -62,7 +73,7 @@ content:
     type: string_textfield
     region: content
   field_disability:
-    weight: 7
+    weight: 15
     settings:
       size: 60
       placeholder: ''
@@ -70,7 +81,7 @@ content:
     type: string_textfield
     region: content
   field_ethnic_o:
-    weight: 4
+    weight: 12
     settings:
       size: 60
       placeholder: ''
@@ -78,13 +89,13 @@ content:
     type: string_textfield
     region: content
   field_gender_identified_with:
-    weight: 1
+    weight: 9
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_general_noes:
-    weight: 13
+    weight: 21
     settings:
       rows: 5
       placeholder: ''
@@ -92,43 +103,67 @@ content:
     type: string_textarea
     region: content
   field_how_heard:
-    weight: 10
+    weight: 18
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_income:
-    weight: 8
+    weight: 16
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_languages_spoken:
-    weight: 6
+    weight: 14
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_marital_:
-    weight: 2
+    weight: 10
     settings: {  }
     third_party_settings: {  }
     type: options_select
     region: content
   field_nationalities:
     type: options_select
-    weight: 5
+    weight: 13
     region: content
     settings: {  }
     third_party_settings: {  }
   field_referred_by:
-    weight: 11
+    weight: 19
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
     type: string_textfield
     region: content
+  first_name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  last_name:
+    type: string_textfield
+    weight: 2
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  middle_names:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   name:
     type: string_textfield
     weight: -4
@@ -137,6 +172,38 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  phone:
+    type: string_textfield
+    weight: 4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  phone2:
+    type: string_textfield
+    weight: 5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  post_code:
+    type: string_textfield
+    weight: 7
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  postal_address:
+    type: string_textarea
+    weight: 6
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   user_id:
     type: entity_reference_autocomplete
     weight: 5
@@ -147,3 +214,8 @@ content:
       match_limit: 10
     region: content
     third_party_settings: {  }
+hidden:
+  field_sex: true
+  full_name: true
+  status: true
+  user_login: true