diff --git a/public/locale/en.json b/public/locale/en.json
index 5008b13f928..3fbcfc3de72 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -1632,6 +1632,7 @@
   "select": "Select",
   "select_all": "Select All",
   "select_date": "Select date",
+  "select_department": "Select Department",
   "select_eligible_policy": "Select an Eligible Insurance Policy",
   "select_facility_for_discharged_patients_warning": "Facility needs to be selected to view discharged patients.",
   "select_for_administration": "Select for Administration",
diff --git a/src/components/Patient/PatientRegistration.tsx b/src/components/Patient/PatientRegistration.tsx
index 1dc236f5fb3..94289124403 100644
--- a/src/components/Patient/PatientRegistration.tsx
+++ b/src/components/Patient/PatientRegistration.tsx
@@ -8,7 +8,6 @@ import SectionNavigator from "@/CAREUI/misc/SectionNavigator";
 
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
-import { InputErrors } from "@/components/ui/errors";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
@@ -49,7 +48,6 @@ import OrganizationSelector from "@/pages/Organization/components/OrganizationSe
 import { PatientModel, validatePatient } from "@/types/emr/patient";
 
 import Autocomplete from "../ui/autocomplete";
-import InputWithError from "../ui/input-with-error";
 
 interface PatientRegistrationPageProps {
   facilityId: string;
@@ -316,71 +314,93 @@ export default function PatientRegistration(
             </h2>
             <div className="text-sm">{t("general_info_detail")}</div>
             <br />
-            <InputWithError label={t("name")} required errors={errors["name"]}>
-              <Input
-                {...fieldProps("name")}
-                placeholder={t("type_patient_name")}
-              />
-            </InputWithError>
+            <Label className="mb-2">
+              {t("name")}
+              <span className="text-red-500">*</span>
+            </Label>
+            <Input
+              {...fieldProps("name")}
+              placeholder={t("type_patient_name")}
+            />
+            <div className="mt-1" data-input-error>
+              {errors["name"] &&
+                errors["name"].map((error, i) => (
+                  <div key={i} className="text-red-500 text-xs">
+                    {error}
+                  </div>
+                ))}
+            </div>
             <br />
-            <InputWithError
-              label={t("phone_number")}
-              required
-              errors={errors["phone_number"]}
-            >
-              <Input
-                {...fieldProps("phone_number")}
-                onChange={(e) => {
-                  if (e.target.value.length > 13) return;
-                  setForm((f) => ({
-                    ...f,
-                    phone_number: e.target.value,
-                    emergency_phone_number: samePhoneNumber
-                      ? e.target.value
-                      : f.emergency_phone_number,
-                  }));
+            <Label className="mb-2">
+              {t("phone_number")}
+              <span className="text-red-500">*</span>
+            </Label>
+            <Input
+              {...fieldProps("phone_number")}
+              onChange={(e) => {
+                if (e.target.value.length > 13) return;
+                setForm((f) => ({
+                  ...f,
+                  phone_number: e.target.value,
+                  emergency_phone_number: samePhoneNumber
+                    ? e.target.value
+                    : f.emergency_phone_number,
+                }));
+              }}
+            />
+            <div className="mt-1" data-input-error>
+              {errors["phone_number"] &&
+                errors["phone_number"]?.map((error, i) => (
+                  <div key={i} className="text-red-500 text-xs">
+                    {error}
+                  </div>
+                ))}
+            </div>
+
+            <div className="mt-1 flex gap-1 items-center">
+              <Checkbox
+                checked={samePhoneNumber}
+                onCheckedChange={() => {
+                  const newValue = !samePhoneNumber;
+                  setSamePhoneNumber(newValue);
+                  if (newValue) {
+                    setForm((f) => ({
+                      ...f,
+                      emergency_phone_number: f.phone_number,
+                    }));
+                  }
                 }}
+                id="same-phone-number"
               />
-            </InputWithError>
-            <div className="mt-1 flex gap-1 items-center">
-              <InputWithError>
-                <Checkbox
-                  checked={samePhoneNumber}
-                  onCheckedChange={() => {
-                    const newValue = !samePhoneNumber;
-                    setSamePhoneNumber(newValue);
-                    if (newValue) {
-                      setForm((f) => ({
-                        ...f,
-                        emergency_phone_number: f.phone_number,
-                      }));
-                    }
-                  }}
-                  id="same-phone-number"
-                />
-                <Label htmlFor="same-phone-number">
-                  {t("use_phone_number_for_emergency")}
-                </Label>
-              </InputWithError>
+              <Label htmlFor="same-phone-number">
+                {t("use_phone_number_for_emergency")}
+              </Label>
             </div>
             <br />
-            <InputWithError
-              label={t("emergency_phone_number")}
-              required
-              errors={errors["emergency_phone_number"]}
-            >
-              <Input
-                {...fieldProps("emergency_phone_number")}
-                onChange={(e) => {
-                  if (e.target.value.length > 13) return;
-                  setForm((f) => ({
-                    ...f,
-                    emergency_phone_number: e.target.value,
-                  }));
-                }}
-                disabled={samePhoneNumber}
-              />
-            </InputWithError>
+
+            <Label className="mb-2">
+              {t("emergency_phone_number")}
+              <span className="text-red-500">*</span>
+            </Label>
+            <Input
+              {...fieldProps("emergency_phone_number")}
+              onChange={(e) => {
+                if (e.target.value.length > 13) return;
+                setForm((f) => ({
+                  ...f,
+                  emergency_phone_number: e.target.value,
+                }));
+              }}
+              disabled={samePhoneNumber}
+            />
+            <div className="mt-1" data-input-error>
+              {errors["emergency_phone_number"] &&
+                errors["emergency_phone_number"]?.map((error, i) => (
+                  <div key={i} className="text-red-500 text-xs">
+                    {error}
+                  </div>
+                ))}
+            </div>
             {/* <br />
             <Input
               // This field does not exist in the backend, but is present in the design
@@ -389,46 +409,66 @@ export default function PatientRegistration(
               placeholder={t("emergency_contact_person_name")}
             /> */}
             <br />
-            <InputWithError label={t("sex")} required errors={errors["gender"]}>
-              <RadioGroup
-                value={form.gender?.toString()}
-                onValueChange={(value) =>
-                  setForm((f) => ({ ...f, gender: value }))
-                }
-                className="flex items-center gap-4"
-              >
-                {GENDER_TYPES.map((g) => (
-                  <Fragment key={g.id}>
-                    <RadioGroupItem
-                      value={g.id.toString()}
-                      id={"gender_" + g.id}
-                    />
-                    <Label htmlFor={"gender_" + g.id}>
-                      {t(`GENDER__${g.id}`)}
-                    </Label>
-                  </Fragment>
+
+            <Label className="mb-2">
+              {t("sex")}
+              <span className="text-red-500">*</span>
+            </Label>
+            <RadioGroup
+              value={form.gender?.toString()}
+              onValueChange={(value) =>
+                setForm((f) => ({ ...f, gender: value }))
+              }
+              className="flex items-center gap-4"
+            >
+              {GENDER_TYPES.map((g) => (
+                <Fragment key={g.id}>
+                  <RadioGroupItem
+                    value={g.id.toString()}
+                    id={"gender_" + g.id}
+                  />
+                  <Label htmlFor={"gender_" + g.id}>
+                    {t(`GENDER__${g.id}`)}
+                  </Label>
+                </Fragment>
+              ))}
+            </RadioGroup>
+            <div className="mt-1" data-input-error>
+              {errors["gender"] &&
+                errors["gender"]?.map((error, i) => (
+                  <div key={i} className="text-red-500 text-xs">
+                    {error}
+                  </div>
                 ))}
-              </RadioGroup>
-            </InputWithError>
+            </div>
+
             <br />
-            <InputWithError
-              label={t("blood_group")}
-              required
-              errors={errors["blood_group"]}
-            >
-              <Select {...selectProps("blood_group")}>
-                <SelectTrigger className="w-full">
-                  <SelectValue />
-                </SelectTrigger>
-                <SelectContent>
-                  {BLOOD_GROUP_CHOICES.map((bg) => (
-                    <SelectItem key={bg.id} value={bg.id}>
-                      {bg.text}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </InputWithError>
+
+            <Label className="mb-2">
+              {t("blood_group")}
+              <span className="text-red-500">*</span>
+            </Label>
+            <Select {...selectProps("blood_group")}>
+              <SelectTrigger className="w-full">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                {BLOOD_GROUP_CHOICES.map((bg) => (
+                  <SelectItem key={bg.id} value={bg.id}>
+                    {bg.text}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+            <div className="mt-1" data-input-error>
+              {errors["blood_group"] &&
+                errors["blood_group"]?.map((error, i) => (
+                  <div key={i} className="text-red-500 text-xs">
+                    {error}
+                  </div>
+                ))}
+            </div>
+
             <br />
             <Tabs
               value={ageDob}
@@ -447,62 +487,74 @@ export default function PatientRegistration(
               <TabsContent value="dob">
                 <div className="flex items-center gap-2">
                   <div className="flex-1">
-                    <InputWithError label={t("day")} required>
-                      <Input
-                        placeholder="DD"
-                        type="number"
-                        value={form.date_of_birth?.split("-")[2] || ""}
-                        maxLength={2}
-                        max={31}
-                        min={1}
-                        onChange={(e) =>
-                          setForm((f) => ({
-                            ...f,
-                            date_of_birth: `${form.date_of_birth?.split("-")[0] || ""}-${form.date_of_birth?.split("-")[1] || ""}-${e.target.value}`,
-                          }))
-                        }
-                      />
-                    </InputWithError>
+                    <Label className="mb-2">
+                      {t("day")}
+                      <span className="text-red-500">*</span>
+                    </Label>
+                    <Input
+                      placeholder="DD"
+                      type="number"
+                      value={form.date_of_birth?.split("-")[2] || ""}
+                      maxLength={2}
+                      max={31}
+                      min={1}
+                      onChange={(e) =>
+                        setForm((f) => ({
+                          ...f,
+                          date_of_birth: `${form.date_of_birth?.split("-")[0] || ""}-${form.date_of_birth?.split("-")[1] || ""}-${e.target.value}`,
+                        }))
+                      }
+                    />
                   </div>
                   <div className="flex-1">
-                    <InputWithError label={t("month")} required>
-                      <Input
-                        placeholder="MM"
-                        type="number"
-                        value={form.date_of_birth?.split("-")[1] || ""}
-                        maxLength={2}
-                        max={12}
-                        min={1}
-                        onChange={(e) =>
-                          setForm((f) => ({
-                            ...f,
-                            date_of_birth: `${form.date_of_birth?.split("-")[0] || ""}-${e.target.value}-${form.date_of_birth?.split("-")[2] || ""}`,
-                          }))
-                        }
-                      />
-                    </InputWithError>
+                    <Label className="mb-2">
+                      {t("month")}
+                      <span className="text-red-500">*</span>
+                    </Label>
+                    <Input
+                      placeholder="MM"
+                      type="number"
+                      value={form.date_of_birth?.split("-")[1] || ""}
+                      maxLength={2}
+                      max={12}
+                      min={1}
+                      onChange={(e) =>
+                        setForm((f) => ({
+                          ...f,
+                          date_of_birth: `${form.date_of_birth?.split("-")[0] || ""}-${e.target.value}-${form.date_of_birth?.split("-")[2] || ""}`,
+                        }))
+                      }
+                    />
                   </div>
                   <div className="flex-1">
-                    <InputWithError label={t("year")} required>
-                      <Input
-                        type="number"
-                        placeholder="YYYY"
-                        value={form.date_of_birth?.split("-")[0] || ""}
-                        maxLength={4}
-                        max={new Date().getFullYear()}
-                        min={1900}
-                        onChange={(e) =>
-                          setForm((f) => ({
-                            ...f,
-                            date_of_birth: `${e.target.value}-${form.date_of_birth?.split("-")[1] || ""}-${form.date_of_birth?.split("-")[2] || ""}`,
-                          }))
-                        }
-                      />
-                    </InputWithError>
+                    <Label className="mb-2">
+                      {t("year")}
+                      <span className="text-red-500">*</span>
+                    </Label>
+                    <Input
+                      type="number"
+                      placeholder="YYYY"
+                      value={form.date_of_birth?.split("-")[0] || ""}
+                      maxLength={4}
+                      max={new Date().getFullYear()}
+                      min={1900}
+                      onChange={(e) =>
+                        setForm((f) => ({
+                          ...f,
+                          date_of_birth: `${e.target.value}-${form.date_of_birth?.split("-")[1] || ""}-${form.date_of_birth?.split("-")[2] || ""}`,
+                        }))
+                      }
+                    />
                   </div>
                 </div>
                 {errors["date_of_birth"] && (
-                  <InputErrors errors={errors["date_of_birth"]} />
+                  <div className="mt-1" data-input-error>
+                    {errors["date_of_birth"].map((error, i) => (
+                      <div key={i} className="text-red-500 text-xs">
+                        {error}
+                      </div>
+                    ))}
+                  </div>
                 )}
               </TabsContent>
               <TabsContent value="age">
@@ -512,25 +564,32 @@ export default function PatientRegistration(
                   <b>{t("age_input_warning_bold")}</b>
                 </div>
                 <div className="relative">
-                  <InputWithError
-                    label={t("age")}
-                    required
-                    errors={errors["year_of_birth"]}
-                  >
-                    <Input
-                      value={form.age ? form.age : undefined}
-                      onChange={(e) =>
-                        setForm((f) => ({
-                          ...f,
-                          age: e.target.value,
-                          year_of_birth: e.target.value
-                            ? new Date().getFullYear() - Number(e.target.value)
-                            : undefined,
-                        }))
-                      }
-                      type="number"
-                    />
-                  </InputWithError>
+                  <Label className="mb-2">
+                    {t("age")}
+                    <span className="text-red-500">*</span>
+                  </Label>
+                  <Input
+                    value={form.age ? form.age : undefined}
+                    onChange={(e) =>
+                      setForm((f) => ({
+                        ...f,
+                        age: e.target.value,
+                        year_of_birth: e.target.value
+                          ? new Date().getFullYear() - Number(e.target.value)
+                          : undefined,
+                      }))
+                    }
+                    type="number"
+                  />
+                  <div className="mt-1" data-input-error>
+                    {errors["year_of_birth"] &&
+                      errors["year_of_birth"]?.map((error, i) => (
+                        <div key={i} className="text-red-500 text-xs">
+                          {error}
+                        </div>
+                      ))}
+                  </div>
+
                   {form.year_of_birth && (
                     <div className="text-xs absolute right-6 top-[22px] bottom-0 flex items-center justify-center p-2 pointer-events-none">
                       {t("year_of_birth")} : {form.year_of_birth}
@@ -540,68 +599,84 @@ export default function PatientRegistration(
               </TabsContent>
             </Tabs>
             <br />
-            <InputWithError
-              label={t("current_address")}
-              required
-              errors={errors["address"]}
-            >
-              <Textarea
-                {...fieldProps("address")}
-                onChange={(e) =>
+
+            <Label className="mb-2">
+              {t("current_address")}
+              <span className="text-red-500">*</span>
+            </Label>
+            <Textarea
+              {...fieldProps("address")}
+              onChange={(e) =>
+                setForm((f) => ({
+                  ...f,
+                  address: e.target.value,
+                  permanent_address: sameAddress
+                    ? e.target.value
+                    : f.permanent_address,
+                }))
+              }
+            />
+            <div className="mt-1" data-input-error>
+              {errors["address"] &&
+                errors["address"]?.map((error, i) => (
+                  <div key={i} className="text-red-500 text-xs">
+                    {error}
+                  </div>
+                ))}
+            </div>
+
+            <div className="mt-1 flex gap-1 items-center">
+              <Checkbox
+                checked={sameAddress}
+                onCheckedChange={() => {
+                  setSameAddress(!sameAddress);
                   setForm((f) => ({
                     ...f,
-                    address: e.target.value,
-                    permanent_address: sameAddress
-                      ? e.target.value
+                    permanent_address: !sameAddress
+                      ? f.address
                       : f.permanent_address,
-                  }))
-                }
+                  }));
+                }}
+                id="same-address"
               />
-            </InputWithError>
-            <div className="mt-1 flex gap-1 items-center">
-              <InputWithError>
-                <Checkbox
-                  checked={sameAddress}
-                  onCheckedChange={() => {
-                    setSameAddress(!sameAddress);
-                    setForm((f) => ({
-                      ...f,
-                      permanent_address: !sameAddress
-                        ? f.address
-                        : f.permanent_address,
-                    }));
-                  }}
-                  id="same-address"
-                />
-                <Label htmlFor="same-address">
-                  {t("use_address_as_permanent")}
-                </Label>
-              </InputWithError>
+              <Label htmlFor="same-address">
+                {t("use_address_as_permanent")}
+              </Label>
             </div>
             <br />
-            <InputWithError label={t("permanent_address")} required>
-              <Textarea
-                {...fieldProps("permanent_address")}
-                value={form.permanent_address}
-                onChange={(e) =>
-                  setForm((f) => ({ ...f, permanent_address: e.target.value }))
-                }
-                disabled={sameAddress}
-              />
-            </InputWithError>
+
+            <Label className="mb-2">
+              {t("permanent_address")}
+              <span className="text-red-500">*</span>
+            </Label>
+            <Textarea
+              {...fieldProps("permanent_address")}
+              value={form.permanent_address}
+              onChange={(e) =>
+                setForm((f) => ({ ...f, permanent_address: e.target.value }))
+              }
+              disabled={sameAddress}
+            />
             {/* <br />
             <Input
               // This field does not exist in the backend, but is present in the design
               label={t("landmark")}
             /> */}
             <br />
-            <InputWithError
-              label={t("pincode")}
-              required
-              errors={errors["pincode"]}
-            >
-              <Input {...fieldProps("pincode")} type="number" />
-            </InputWithError>
+            <Label className="mb-2">
+              {t("pincode")}
+              <span className="text-red-500">*</span>
+            </Label>
+            <Input {...fieldProps("pincode")} type="number" />
+            <div className="mt-1" data-input-error>
+              {errors["pincode"] &&
+                errors["pincode"]?.map((error, i) => (
+                  <div key={i} className="text-red-500 text-xs">
+                    {error}
+                  </div>
+                ))}
+            </div>
+
             {/* {showAutoFilledPincode && (
               <div>
                 <CareIcon
@@ -616,22 +691,28 @@ export default function PatientRegistration(
             <br />
             <div className="grid grid-cols-2 gap-4">
               <div>
-                <InputWithError
-                  label={t("nationality")}
-                  errors={errors["nationality"]}
-                  required
-                >
-                  <Autocomplete
-                    options={countryList.map((c) => ({ label: c, value: c }))}
-                    value={form.nationality || ""}
-                    onChange={(value) => {
-                      setForm((f) => ({
-                        ...f,
-                        nationality: value,
-                      }));
-                    }}
-                  />
-                </InputWithError>
+                <Label className="mb-2">
+                  {t("nationality")}
+                  <span className="text-red-500">*</span>
+                </Label>
+                <Autocomplete
+                  options={countryList.map((c) => ({ label: c, value: c }))}
+                  value={form.nationality || ""}
+                  onChange={(value) => {
+                    setForm((f) => ({
+                      ...f,
+                      nationality: value,
+                    }));
+                  }}
+                />
+                <div className="mt-1" data-input-error>
+                  {errors["nationality"] &&
+                    errors["nationality"]?.map((error, i) => (
+                      <div key={i} className="text-red-500 text-xs">
+                        {error}
+                      </div>
+                    ))}
+                </div>
               </div>
               {form.nationality === "India" && (
                 <>
diff --git a/src/components/ui/errors.tsx b/src/components/ui/errors.tsx
deleted file mode 100644
index debe66d7308..00000000000
--- a/src/components/ui/errors.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-export function InputErrors({ errors }: { errors?: string[] }) {
-  return errors && !!errors.length ? (
-    <div className="mt-1" data-input-error>
-      {errors?.map((error, i) => (
-        <div key={i} className="text-red-500 text-xs">
-          {error}
-        </div>
-      ))}
-    </div>
-  ) : null;
-}
diff --git a/src/components/ui/input-with-error.tsx b/src/components/ui/input-with-error.tsx
deleted file mode 100644
index 01e27d92775..00000000000
--- a/src/components/ui/input-with-error.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { InputErrors } from "./errors";
-import { Label } from "./label";
-
-export default function InputWithError(props: {
-  label?: string;
-  required?: boolean;
-  errors?: string[];
-  children: React.ReactNode;
-}) {
-  const { label, errors, children, required } = props;
-
-  return (
-    <>
-      {label && (
-        <Label className="mb-2">
-          {label}
-          {required && <span className="text-red-500">*</span>}
-        </Label>
-      )}
-      {children}
-      <InputErrors errors={errors} />
-    </>
-  );
-}
diff --git a/src/pages/FacilityOrganization/components/FacilityOrganizationSelector.tsx b/src/pages/FacilityOrganization/components/FacilityOrganizationSelector.tsx
index 92b0778d184..b9c32974a82 100644
--- a/src/pages/FacilityOrganization/components/FacilityOrganizationSelector.tsx
+++ b/src/pages/FacilityOrganization/components/FacilityOrganizationSelector.tsx
@@ -1,12 +1,13 @@
 import { useQuery } from "@tanstack/react-query";
 import { useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import Autocomplete from "@/components/ui/autocomplete";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
-import InputWithError from "@/components/ui/input-with-error";
+import { Label } from "@/components/ui/label";
 
 import routes from "@/Utils/request/api";
 import query from "@/Utils/request/query";
@@ -31,6 +32,7 @@ interface AutoCompleteOption {
 export default function FacilityOrganizationSelector(
   props: FacilityOrganizationSelectorProps,
 ) {
+  const { t } = useTranslation();
   const { onChange, required, facilityId } = props;
   const [selectedLevels, setSelectedLevels] = useState<FacilityOrganization[]>(
     [],
@@ -106,7 +108,11 @@ export default function FacilityOrganizationSelector(
   };
 
   return (
-    <InputWithError label="Select Department" required={required}>
+    <>
+      <Label className="mb-2">
+        {t("select_department")}
+        {required && <span className="text-red-500">*</span>}
+      </Label>
       <div className="space-y-4">
         {/* Selected Organization Display */}
         {selectedOrganization && (
@@ -185,6 +191,6 @@ export default function FacilityOrganizationSelector(
           </div>
         )}
       </div>
-    </InputWithError>
+    </>
   );
 }
diff --git a/src/pages/Organization/components/OrganizationSelector.tsx b/src/pages/Organization/components/OrganizationSelector.tsx
index a5880f30872..4f4be545bb2 100644
--- a/src/pages/Organization/components/OrganizationSelector.tsx
+++ b/src/pages/Organization/components/OrganizationSelector.tsx
@@ -6,7 +6,7 @@ import CareIcon from "@/CAREUI/icons/CareIcon";
 
 import Autocomplete from "@/components/ui/autocomplete";
 import { Button } from "@/components/ui/button";
-import InputWithError from "@/components/ui/input-with-error";
+import { Label } from "@/components/ui/label";
 
 import useDebouncedState from "@/hooks/useDebouncedState";
 
@@ -111,27 +111,25 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
       {/* Selected Levels */}
       {selectedLevels.map((level, index) => (
         <div>
-          <InputWithError
-            key={level.id}
-            label={t(`SYSTEM__govt_org_type__${level.metadata?.govt_org_type}`)}
-            required={required}
-          >
-            <div className="flex">
-              <div className="flex items-center h-9 w-full rounded-md border border-gray-200 bg-white px-3 py-1 text-base shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-gray-950 placeholder:text-gray-500 focus-visible:border-primary-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary-500 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:border-gray-800 dark:file:text-gray-50 dark:placeholder:text-gray-400 dark:focus-visible:ring-gray-300">
-                <div className="w-full text-nowrap overflow-x-auto">
-                  {level.name}
-                </div>
+          <Label className="mb-2">
+            {t(`SYSTEM__govt_org_type__${level.metadata?.govt_org_type}`)}
+            {required && <span className="text-red-500">*</span>}
+          </Label>
+          <div className="flex">
+            <div className="flex items-center h-9 w-full rounded-md border border-gray-200 bg-white px-3 py-1 text-base shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium file:text-gray-950 placeholder:text-gray-500 focus-visible:border-primary-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary-500 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:border-gray-800 dark:file:text-gray-50 dark:placeholder:text-gray-400 dark:focus-visible:ring-gray-300">
+              <div className="w-full text-nowrap overflow-x-auto">
+                {level.name}
               </div>
-              <Button
-                variant="ghost"
-                size="icon"
-                onClick={() => handleEdit(index)}
-                type="button"
-              >
-                <CareIcon icon="l-trash" className="h-4 w-4" />
-              </Button>
             </div>
-          </InputWithError>
+            <Button
+              variant="ghost"
+              size="icon"
+              onClick={() => handleEdit(index)}
+              type="button"
+            >
+              <CareIcon icon="l-trash" className="h-4 w-4" />
+            </Button>
+          </div>
         </div>
       ))}
 
@@ -139,26 +137,25 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
       {(!selectedLevels.length ||
         selectedLevels[selectedLevels.length - 1]?.has_children) && (
         <div>
-          <InputWithError
-            label={t(
+          <Label className="mb-2">
+            {t(
               lastLevel
                 ? `SYSTEM__govt_org_type__${lastLevel.metadata?.govt_org_children_type || "default"}`
                 : "SYSTEM__govt_org_type__default",
             )}
-          >
-            <Autocomplete
-              value=""
-              options={getOrganizationOptions(
-                selectedLevels.length === 0
-                  ? getAllOrganizations?.results
-                  : currentLevelOrganizations?.results,
-              )}
-              onChange={(value: string) =>
-                handleLevelChange(value, selectedLevels.length)
-              }
-              onSearch={setSearchQuery}
-            />
-          </InputWithError>
+          </Label>
+          <Autocomplete
+            value=""
+            options={getOrganizationOptions(
+              selectedLevels.length === 0
+                ? getAllOrganizations?.results
+                : currentLevelOrganizations?.results,
+            )}
+            onChange={(value: string) =>
+              handleLevelChange(value, selectedLevels.length)
+            }
+            onSearch={setSearchQuery}
+          />
         </div>
       )}
     </>