diff --git a/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.spec.tsx b/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.spec.tsx
index 6f9528e25b..ce787964ed 100644
--- a/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.spec.tsx
+++ b/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.spec.tsx
@@ -95,6 +95,22 @@ describe('when entering patient sex and birth demographics', () => {
         expect(container.querySelector('span.value')?.innerHTML).toBe('');
     });
 
+    it('should render age only when date of birth is valid', async () => {
+        const { container, getByText, getByLabelText } = render(<Fixture />);
+        const dateOfBirth = getByLabelText('Date of birth');
+
+        expect(getByText('Current age')).toBeInTheDocument();
+        expect(container.querySelector('span.value')?.innerHTML).toBe('');
+
+        act(() => {
+            userEvent.clear(dateOfBirth);
+            userEvent.type(dateOfBirth, '12012012');
+            userEvent.tab();
+        });
+
+        expect(container.querySelector('span.value')?.innerHTML).toContain('years');
+    });
+
     it('should enable Date of death when deceased is true', async () => {
         const { getByLabelText, queryByLabelText } = render(<Fixture />);
 
diff --git a/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.tsx b/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.tsx
index 0763c26e28..16bb6c80d0 100644
--- a/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.tsx
+++ b/apps/modernization-ui/src/apps/patient/add/basic/personalDetails/BasicPersonalDetailsFields.tsx
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { Controller, useFormContext, useFormState, useWatch } from 'react-hook-form';
+import { Controller, useFormContext, useWatch } from 'react-hook-form';
 import { usePatientSexBirthCodedValues } from 'apps/patient/profile/sexBirth/usePatientSexBirthCodedValues';
 import { DatePickerInput, validDateRule } from 'design-system/date';
 import { SingleSelect } from 'design-system/select';
@@ -21,14 +21,14 @@ const ENTRY_FIELD_PLACEHOLDER = '';
 type BasicPersonalDetailsProps = EntryFieldsProps;
 
 export const BasicPersonalDetailsFields = ({ orientation = 'horizontal' }: BasicPersonalDetailsProps) => {
-    const { control } = useFormContext<{ personalDetails: BasicPersonalDetailsEntry }>();
+    const { control, formState, getFieldState } = useFormContext<{ personalDetails: BasicPersonalDetailsEntry }>();
     const currentBirthday = useWatch({ control, name: 'personalDetails.bornOn' });
     const selectedDeceased = useWatch({ control, name: 'personalDetails.deceased' });
     const age = useMemo(() => displayAgeAsOfToday(currentBirthday), [currentBirthday]);
     const sexBirthValues = usePatientSexBirthCodedValues();
     const generalValues = usePatientGeneralCodedValues();
     const { hivAccess } = usePatientProfilePermissions();
-    const { isValid: bornOnValid } = useFormState({ control, name: 'personalDetails.bornOn' });
+    const { invalid: bornOnInvalid } = getFieldState('personalDetails.bornOn', formState);
 
     return (
         <section>
@@ -48,7 +48,7 @@ export const BasicPersonalDetailsFields = ({ orientation = 'horizontal' }: Basic
                     />
                 )}
             />
-            <ValueView title="Current age" value={bornOnValid ? age : null} />
+            <ValueView title="Current age" value={!bornOnInvalid ? age : null} />
             <Controller
                 control={control}
                 name="personalDetails.currentSex"
@@ -103,7 +103,7 @@ export const BasicPersonalDetailsFields = ({ orientation = 'horizontal' }: Basic
                     name="personalDetails.deceasedOn"
                     shouldUnregister
                     rules={validDateRule(DECEASED_ON_LABEL)}
-                    render={({ field: { onChange, onBlur, value, name } }) => (
+                    render={({ field: { onChange, onBlur, value, name }, fieldState: { error } }) => (
                         <DatePickerInput
                             id={name}
                             label={DECEASED_ON_LABEL}
@@ -111,6 +111,7 @@ export const BasicPersonalDetailsFields = ({ orientation = 'horizontal' }: Basic
                             value={value}
                             onChange={onChange}
                             onBlur={onBlur}
+                            error={error?.message}
                         />
                     )}
                 />
@@ -135,7 +136,7 @@ export const BasicPersonalDetailsFields = ({ orientation = 'horizontal' }: Basic
                 <Controller
                     control={control}
                     name="personalDetails.stateHIVCase"
-                    rules={maxLengthRule(20, STATE_HIV_CASE_LABEL)}
+                    rules={maxLengthRule(16, STATE_HIV_CASE_LABEL)}
                     render={({ field: { onChange, onBlur, value, name }, fieldState: { error } }) => (
                         <Input
                             label={STATE_HIV_CASE_LABEL}
@@ -143,6 +144,7 @@ export const BasicPersonalDetailsFields = ({ orientation = 'horizontal' }: Basic
                             placeholder={ENTRY_FIELD_PLACEHOLDER}
                             onBlur={onBlur}
                             onChange={onChange}
+                            maxLength={16}
                             type="text"
                             defaultValue={value}
                             htmlFor={name}