diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx
index 7eecbf520..36896606e 100644
--- a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx
@@ -33,7 +33,7 @@ export function ObsField({ fieldDefinition }: ObsFieldProps) {
     return null;
   }
 
-  switch (concept.datatype.display) {
+  switch (concept?.datatype?.display) {
     case 'Text':
       return (
         <TextObsField
diff --git a/packages/esm-patient-registration-app/src/patient-verification/patient-verification-hook.tsx b/packages/esm-patient-registration-app/src/patient-verification/patient-verification-hook.tsx
index cb842b80b..f005bd7f2 100644
--- a/packages/esm-patient-registration-app/src/patient-verification/patient-verification-hook.tsx
+++ b/packages/esm-patient-registration-app/src/patient-verification/patient-verification-hook.tsx
@@ -108,7 +108,7 @@ export function useGlobalProperties() {
   const { data, isLoading, error } = useSWRImmutable(
     `https://afyakenyaidentityapi.health.go.ke/connect/token`,
     swrFetcher,
-    { refreshInterval: 864000 },
+    { refreshInterval: 864000, errorRetryCount: 0 },
   );
   return { data: data, isLoading, error };
 }
diff --git a/packages/esm-patient-registration-app/src/patient-verification/patient-verification.component.tsx b/packages/esm-patient-registration-app/src/patient-verification/patient-verification.component.tsx
index 0f16b265f..a3fc00bc9 100644
--- a/packages/esm-patient-registration-app/src/patient-verification/patient-verification.component.tsx
+++ b/packages/esm-patient-registration-app/src/patient-verification/patient-verification.component.tsx
@@ -58,6 +58,9 @@ const PatientVerification: React.FC<PatientVerificationProps> = ({ props }) => {
       <h3 className={styles.productiveHeading02} style={{ color: '#161616' }}>
         {t('clientVerificationWithClientRegistry', 'Client verification with client registry')}
       </h3>
+      <span className={styles.label01}>
+        {t('allFieldsRequiredText', 'All fields are required unless marked optional')}
+      </span>
       <div style={{ margin: '1rem 0 1rem' }}>
         <Layer>
           {isLoading && <InlineLoading status="active" iconDescription="Loading" description="Loading data..." />}
diff --git a/packages/esm-patient-registration-app/src/patient-verification/patient-verification.scss b/packages/esm-patient-registration-app/src/patient-verification/patient-verification.scss
index 044c03564..10291355c 100644
--- a/packages/esm-patient-registration-app/src/patient-verification/patient-verification.scss
+++ b/packages/esm-patient-registration-app/src/patient-verification/patient-verification.scss
@@ -1,4 +1,7 @@
 @use '@carbon/colors';
+@use '@carbon/layout';
+@use '@carbon/type';
+@use '@openmrs/esm-styleguide/src/vars' as *;
 @import '../patient-registration/patient-registration.scss';
 
 /* Desktop */
@@ -23,3 +26,16 @@
 .errorWrapper {
   margin: 0 0 1rem 0;
 }
+
+.label01 {
+  @include type.type-style('label-01');
+  margin-top: layout.$spacing-05;
+  margin-bottom: layout.$spacing-05;
+  color: $ui-04;
+}
+
+.productiveHeading02 {
+  @include type.type-style('heading-compact-02');
+  color: $ui-04;
+  cursor: pointer;
+}