diff --git a/configuration/ampathforms/MAT_Clinical_Encounter_Form.json b/configuration/ampathforms/MAT_Clinical_Encounter_Form.json
index 971b3d82..6e8d907a 100644
--- a/configuration/ampathforms/MAT_Clinical_Encounter_Form.json
+++ b/configuration/ampathforms/MAT_Clinical_Encounter_Form.json
@@ -15,24 +15,25 @@
           "isExpanded": "true",
           "questions": [
             {
-              "label": "Date:",
+              "label": "Visit date:",
               "type": "encounterDatetime",
+              "required": "true",
+              "id": "encDate",
               "questionOptions": {
-                "rendering": "ui-select-extended"
+                "rendering": "date"
               },
               "validators": [
                 {
                   "type": "date",
                   "allowFutureDates": "false"
                 }
-              ],
-              "id": "encDate"
+              ]
             },
             {
               "label": "Provider:",
               "type": "encounterProvider",
               "questionOptions": {
-                "rendering": "text"
+                "rendering": "ui-select-extended"
               },
               "id": "encProvider "
             },
@@ -40,8 +41,7 @@
               "label": "Location:",
               "type": "encounterLocation",
               "questionOptions": {
-                "rendering": "encounter-location",
-                "locationTag": ""
+                "rendering": "ui-select-extended"
               },
               "id": "encLocation"
             }