diff --git a/src/components/Facility/FacilityForm.tsx b/src/components/Facility/FacilityForm.tsx
index 1aea913355c..09833e2cc6d 100644
--- a/src/components/Facility/FacilityForm.tsx
+++ b/src/components/Facility/FacilityForm.tsx
@@ -140,7 +140,11 @@ export default function FacilityForm(props: FacilityProps) {
     data: FacilityFormValues,
   ) => {
     if (facilityId) {
-      updateFacility(data);
+      updateFacility({
+        ...data,
+        latitude: data.latitude ?? 0,
+        longitude: data.longitude ?? 0,
+      });
     } else {
       createFacility(data);
     }
@@ -224,8 +228,12 @@ export default function FacilityForm(props: FacilityProps) {
         )?.id,
         address: facilityData.address,
         phone_number: facilityData.phone_number,
-        latitude: Number(facilityData.latitude),
-        longitude: Number(facilityData.longitude),
+        latitude: facilityData.latitude
+          ? Number(facilityData.latitude)
+          : undefined,
+        longitude: facilityData.longitude
+          ? Number(facilityData.longitude)
+          : undefined,
         is_public: facilityData.is_public,
       });
     }
@@ -466,7 +474,10 @@ export default function FacilityForm(props: FacilityProps) {
                       {...field}
                       type="number"
                       onChange={(e) => {
-                        form.setValue("latitude", Number(e.target.value));
+                        form.setValue(
+                          "latitude",
+                          e.target.value ? Number(e.target.value) : undefined,
+                        );
                       }}
                       data-cy="facility-latitude"
                       placeholder="Enter latitude"
@@ -490,7 +501,10 @@ export default function FacilityForm(props: FacilityProps) {
                       {...field}
                       type="number"
                       onChange={(e) => {
-                        form.setValue("longitude", Number(e.target.value));
+                        form.setValue(
+                          "longitude",
+                          e.target.value ? Number(e.target.value) : undefined,
+                        );
                       }}
                       data-cy="facility-longitude"
                       placeholder="Enter longitude"
diff --git a/src/components/Patient/PatientRegistration.tsx b/src/components/Patient/PatientRegistration.tsx
index 6471b8d4205..7edbffcc9e2 100644
--- a/src/components/Patient/PatientRegistration.tsx
+++ b/src/components/Patient/PatientRegistration.tsx
@@ -215,7 +215,13 @@ export default function PatientRegistration(
 
   function onSubmit(values: z.infer<typeof formSchema>) {
     if (patientId) {
-      updatePatient({ ...values, ward_old: undefined });
+      updatePatient({
+        ...values,
+        ward_old: undefined,
+        age: values.age_or_dob === "age" ? values.age : undefined,
+        date_of_birth:
+          values.age_or_dob === "dob" ? values.date_of_birth : undefined,
+      });
       return;
     }
 
diff --git a/src/components/ui/sidebar/nav-user.tsx b/src/components/ui/sidebar/nav-user.tsx
index 426ec8b5bee..3508e1beb70 100644
--- a/src/components/ui/sidebar/nav-user.tsx
+++ b/src/components/ui/sidebar/nav-user.tsx
@@ -191,15 +191,6 @@ export function PatientNavUser() {
               </div>
             </DropdownMenuLabel>
             <DropdownMenuSeparator />
-            <DropdownMenuGroup>
-              {patient && (
-                <DropdownMenuItem>
-                  <BadgeCheck />
-                  {t("profile")}
-                </DropdownMenuItem>
-              )}
-            </DropdownMenuGroup>
-            <DropdownMenuSeparator />
             <DropdownMenuItem onClick={signOut}>
               <LogOut />
               {t("logout")}