diff --git a/cypress/e2e/users_spec/user_crud.cy.ts b/cypress/e2e/users_spec/user_crud.cy.ts
index e24998295b9..ace5cfe5c2e 100644
--- a/cypress/e2e/users_spec/user_crud.cy.ts
+++ b/cypress/e2e/users_spec/user_crud.cy.ts
@@ -11,7 +11,7 @@ const makeid = (length: number) => {
 };
 
 const makePhoneNumber = () =>
-  "9199" + Math.floor(Math.random() * 99999999).toString();
+  "98" + Math.floor(Math.random() * 99999999).toString();
 
 const username = makeid(25);
 const phone_number = makePhoneNumber();
@@ -41,29 +41,28 @@ describe("User management", () => {
     cy.intercept(/\/api\/v1\/facility/).as("facility");
     cy.get("[name='facilities']").type("Mysore").wait("@facility");
     cy.get("[name='facilities']").type("{downarrow}{enter}");
+    cy.get("input[type='checkbox']").click();
+    cy.get("[placeholder='Phone Number']").type(phone_number);
+    cy.get("[placeholder='WhatsApp Phone Number']").type(alt_phone_number, {
+      force: true,
+    });
     cy.intercept(/users/).as("check_availability");
     cy.get("[name='username']").type(username, { force: true });
+    cy.get("[id='date_of_birth']").click();
+    cy.get("div").contains("20").click();
+    cy.get("[id='year-0']").click();
+    cy.get("[id='date-1']").click();
     cy.wait("@check_availability").its("response.statusCode").should("eq", 200);
     cy.get("[name='password']").type("#@Cypress_test123");
     cy.get("[name='c_password']").type("#@Cypress_test123");
     cy.get("[name='first_name']").type("Cypress Test");
     cy.get("[name='last_name']").type("Tester");
+    cy.get("[name='email']").type("cypress@tester.com");
     cy.get("[id='gender'] > div > button").click();
     cy.get("div").contains("Male").click();
-    cy.get("[id='date_of_birth']").click();
-    cy.get("div").contains("20").click();
-    cy.get("body").click(700, 450);
-    cy.get("body").click(720, 470);
-    cy.get("input[type='checkbox']").click();
-    cy.wait(1000);
-    cy.get("[placeholder='Phone Number']").type(phone_number);
-    cy.wait(1000);
-    cy.get("[placeholder='WhatsApp Phone Number']").type(alt_phone_number, {
+    cy.get("button[id='submit']").contains("Save User").click({
       force: true,
     });
-    cy.wait(1000);
-    cy.get("[name='email']").type("cypress@tester.com");
-    cy.get("button[id='submit']").contains("Save User").click();
     cy.verifyNotification("User added successfully");
   });
 
@@ -72,10 +71,10 @@ describe("User management", () => {
     cy.get("[name='first_name']").type("Cypress Test");
     cy.get("[name='last_name']").type("Tester");
     cy.get("[placeholder='Phone Number']").type(phone_number);
+    cy.get("input[name='district']").type("Ernakulam");
     cy.get("[placeholder='WhatsApp Phone Number']").type(alt_phone_number);
     cy.contains("Apply").click();
     cy.get("[name='username']").type(username, { force: true });
-    // TODO: some verify task
   });
 
   it("link facility for user", () => {
diff --git a/src/Components/Common/DateInputV2.tsx b/src/Components/Common/DateInputV2.tsx
index a2c1e1ec091..aa4e2150e6b 100644
--- a/src/Components/Common/DateInputV2.tsx
+++ b/src/Components/Common/DateInputV2.tsx
@@ -252,8 +252,12 @@ const DateInputV2: React.FC<Props> = ({
               {type === "date" && (
                 <>
                   <div className="flex flex-wrap mb-3">
-                    {DAYS.map((day) => (
-                      <div key={day} className="aspect-square w-[14.26%]">
+                    {DAYS.map((day, i) => (
+                      <div
+                        key={day}
+                        id={`day-${i}`}
+                        className="aspect-square w-[14.26%]"
+                      >
                         <div className="text-gray-800 font-medium text-center text-sm">
                           {day}
                         </div>
@@ -268,7 +272,11 @@ const DateInputV2: React.FC<Props> = ({
                       />
                     ))}
                     {dayCount.map((d, i) => (
-                      <div key={i} className="aspect-square w-[14.26%]">
+                      <div
+                        key={i}
+                        id={`date-${d}`}
+                        className="aspect-square w-[14.26%]"
+                      >
                         <div
                           onClick={setDateValue(d)}
                           className={classNames(
@@ -293,6 +301,7 @@ const DateInputV2: React.FC<Props> = ({
                     .map((_, i) => (
                       <div
                         key={i}
+                        id={`month-${i}`}
                         className={classNames(
                           "cursor-pointer w-1/4 font-semibold py-4 px-2 text-center text-sm rounded-lg",
                           value && isSelectedMonth(i)
@@ -322,6 +331,7 @@ const DateInputV2: React.FC<Props> = ({
                       return (
                         <div
                           key={i}
+                          id={`year-${i}`}
                           className={classNames(
                             "cursor-pointer w-1/4 font-semibold py-4 px-2 text-center text-sm rounded-lg",
                             value && isSelectedYear(y)
diff --git a/src/Components/Form/SelectMenuV2.tsx b/src/Components/Form/SelectMenuV2.tsx
index 41eef549ec7..f09e1437cea 100644
--- a/src/Components/Form/SelectMenuV2.tsx
+++ b/src/Components/Form/SelectMenuV2.tsx
@@ -3,6 +3,7 @@ import { Listbox } from "@headlessui/react";
 import { DropdownTransition } from "../Common/components/HelperComponents";
 import CareIcon from "../../CAREUI/icons/CareIcon";
 import { dropdownOptionClassNames } from "./MultiSelectMenuV2";
+import { classNames } from "../../Utils/utils";
 
 type OptionCallback<T, R> = (option: T) => R;
 
@@ -12,6 +13,7 @@ type SelectMenuProps<T, V = T> = {
   disabled?: boolean | undefined;
   value: V | undefined;
   placeholder?: React.ReactNode;
+  position?: "above" | "below";
   optionLabel: OptionCallback<T, React.ReactNode>;
   optionSelectedLabel?: OptionCallback<T, React.ReactNode>;
   optionDescription?: OptionCallback<T, React.ReactNode>;
@@ -99,40 +101,47 @@ const SelectMenuV2 = <T, V>(props: SelectMenuProps<T, V>) => {
                   )}
                 </div>
               </Listbox.Button>
-              <DropdownTransition show={open}>
-                <Listbox.Options className="cui-dropdown-base origin-top-right absolute mt-0.5">
-                  {options.map((option, index) => (
-                    <Listbox.Option
-                      id={`${props.id}-option-${option.value}`}
-                      key={index}
-                      className={dropdownOptionClassNames}
-                      value={option}
-                    >
-                      {({ active, selected }) => (
-                        <div className="flex flex-col gap-2">
-                          <div className="flex justify-between">
-                            {option.label}
-                            {props.optionIcon
-                              ? option.icon
-                              : selected && (
-                                  <CareIcon className="care-l-check text-lg" />
-                                )}
+              <div
+                className={classNames(
+                  "absolute z-10 w-full",
+                  props.position === "above" ? "bottom-0 mb-14" : "top-0 mt-14"
+                )}
+              >
+                <DropdownTransition show={open}>
+                  <Listbox.Options className="cui-dropdown-base origin-top-right absolute mt-0.5">
+                    {options.map((option, index) => (
+                      <Listbox.Option
+                        id={`${props.id}-option-${option.value}`}
+                        key={index}
+                        className={dropdownOptionClassNames}
+                        value={option}
+                      >
+                        {({ active, selected }) => (
+                          <div className="flex flex-col gap-2">
+                            <div className="flex justify-between">
+                              {option.label}
+                              {props.optionIcon
+                                ? option.icon
+                                : selected && (
+                                    <CareIcon className="care-l-check text-lg" />
+                                  )}
+                            </div>
+                            {option.description && (
+                              <p
+                                className={`font-normal ${
+                                  active ? "text-primary-200" : "text-gray-700"
+                                }`}
+                              >
+                                {option.description}
+                              </p>
+                            )}
                           </div>
-                          {option.description && (
-                            <p
-                              className={`font-normal ${
-                                active ? "text-primary-200" : "text-gray-700"
-                              }`}
-                            >
-                              {option.description}
-                            </p>
-                          )}
-                        </div>
-                      )}
-                    </Listbox.Option>
-                  ))}
-                </Listbox.Options>
-              </DropdownTransition>
+                        )}
+                      </Listbox.Option>
+                    ))}
+                  </Listbox.Options>
+                </DropdownTransition>
+              </div>
             </div>
           </>
         )}
diff --git a/src/Components/Users/UserAdd.tsx b/src/Components/Users/UserAdd.tsx
index 41b5f67f269..27e906158f6 100644
--- a/src/Components/Users/UserAdd.tsx
+++ b/src/Components/Users/UserAdd.tsx
@@ -544,7 +544,7 @@ export const UserAdd = (props: UserProps) => {
         email: state.form.email,
         state: state.form.state,
         district: state.form.district,
-        local_body: state.form.local_body,
+        local_body: showLocalbody ? state.form.local_body : null,
         phone_number: parsePhoneNumberFromString(
           state.form.phone_number
         )?.format("E.164"),
@@ -616,7 +616,6 @@ export const UserAdd = (props: UserProps) => {
                   showAll={false}
                 />
               </div>
-
               <div>
                 <label className="mb-2">
                   User Type
@@ -647,92 +646,42 @@ export const UserAdd = (props: UserProps) => {
                 />
                 <ErrorHelperText error={state.errors.home_facility} />
               </div>
-
               <div>
                 <label className="mb-2">
-                  State
+                  Phone Number
                   <span className="text-red-500">{" *"}</span>
                 </label>
-                {isStateLoading ? (
-                  <CircularProgress size={20} />
-                ) : (
-                  <>
-                    <SelectMenuV2
-                      id="state"
-                      placeholder="Choose State *"
-                      options={states}
-                      optionLabel={(o) => o.name}
-                      optionValue={(o) => o.id}
-                      value={state.form.state}
-                      onChange={(e) => {
-                        if (e) {
-                          return [
-                            handleValueChange(e, "state"),
-                            fetchDistricts(e),
-                          ];
-                        }
-                      }}
-                    />
-                    <ErrorHelperText error={state.errors.state} />
-                  </>
-                )}
+                <PhoneNumberField
+                  placeholder="Phone Number"
+                  value={state.form.phone_number}
+                  onChange={(value: any) =>
+                    handleValueChange(value, "phone_number")
+                  }
+                  errors={state.errors.phone_number}
+                  onlyIndia={true}
+                />
+                <Checkbox
+                  checked={phoneIsWhatsApp}
+                  onCheck={(checked) => {
+                    setPhoneIsWhatsApp(checked);
+                    !checked && handleValueChange("+91", "alt_phone_number");
+                  }}
+                  label="Is the phone number a WhatsApp number?"
+                />
               </div>
-
               <div>
-                <label className="mb-2">
-                  District
-                  <span className="text-red-500">{" *"}</span>
-                </label>
-                {isDistrictLoading ? (
-                  <CircularProgress size={20} />
-                ) : (
-                  <>
-                    <SelectMenuV2
-                      id="district"
-                      placeholder="Choose District"
-                      options={districts}
-                      optionLabel={(o) => o.name}
-                      optionValue={(o) => o.id}
-                      value={state.form.district}
-                      onChange={(e) => {
-                        if (e) {
-                          return [
-                            handleValueChange(e, "district"),
-                            fetchLocalBody(e),
-                          ];
-                        }
-                      }}
-                    />
-                    <ErrorHelperText error={state.errors.district} />
-                  </>
-                )}
+                <label className="mb-2">Whatsapp Number</label>
+                <PhoneNumberField
+                  placeholder="WhatsApp Phone Number"
+                  value={state.form.alt_phone_number}
+                  onChange={(value: any) =>
+                    handleValueChange(value, "alt_phone_number")
+                  }
+                  disabled={phoneIsWhatsApp}
+                  errors={state.errors.alt_phone_number}
+                  onlyIndia={true}
+                />
               </div>
-
-              {showLocalbody && (
-                <div>
-                  <label className="mb-2">
-                    LocalBody
-                    <span className="text-red-500">{" *"}</span>
-                  </label>
-                  {isLocalbodyLoading ? (
-                    <CircularProgress size={20} />
-                  ) : (
-                    <>
-                      <SelectMenuV2
-                        id="localbody"
-                        placeholder="Choose LocalBody"
-                        options={localBodies}
-                        optionLabel={(o) => o.name}
-                        optionValue={(o) => o.id}
-                        value={state.form.local_body}
-                        onChange={(e) => handleValueChange(e, "local_body")}
-                      />
-                      <ErrorHelperText error={state.errors.local_body} />
-                    </>
-                  )}
-                </div>
-              )}
-
               <div>
                 <label className="mb-2">
                   Username
@@ -803,6 +752,21 @@ export const UserAdd = (props: UserProps) => {
                   </div>
                 )}
               </div>
+              <div>
+                <label className="mb-2">
+                  Date of birth
+                  <span className="text-red-500">{" *"}</span>
+                </label>
+                <DateFormField
+                  id="date_of_birth"
+                  name="date_of_birth"
+                  value={getDate(state.form.date_of_birth)}
+                  onChange={handleDateChange}
+                  error={state.errors.date_of_birth}
+                  position="LEFT"
+                  maxDate={new Date()}
+                />
+              </div>
               <div>
                 <label className="mb-2">
                   Password
@@ -840,7 +804,6 @@ export const UserAdd = (props: UserProps) => {
                   </div>
                 )}
               </div>
-
               <div>
                 <label className="mb-2">
                   Confirm Password
@@ -864,7 +827,6 @@ export const UserAdd = (props: UserProps) => {
                     "Confirm password should match the entered password"
                   )}
               </div>
-
               <div>
                 <label className="mb-2">
                   First name
@@ -878,7 +840,6 @@ export const UserAdd = (props: UserProps) => {
                   error={state.errors.first_name}
                 />
               </div>
-
               <div>
                 <label className="mb-2">
                   Last name
@@ -892,7 +853,19 @@ export const UserAdd = (props: UserProps) => {
                   error={state.errors.last_name}
                 />
               </div>
-
+              <div>
+                <label className="mb-2">
+                  Email
+                  <span className="text-red-500">{" *"}</span>
+                </label>
+                <TextFormField
+                  id="email"
+                  name="email"
+                  value={state.form.email}
+                  onChange={handleChange}
+                  error={state.errors.email}
+                />
+              </div>
               <div>
                 <label className="mb-2">
                   Gender
@@ -907,72 +880,89 @@ export const UserAdd = (props: UserProps) => {
                   onChange={(e) => handleValueChange(e, "gender")}
                 />
               </div>
-
-              <div>
-                <label className="mb-2">
-                  Date of birth
-                  <span className="text-red-500">{" *"}</span>
-                </label>
-                <DateFormField
-                  id="date_of_birth"
-                  name="date_of_birth"
-                  value={getDate(state.form.date_of_birth)}
-                  onChange={handleDateChange}
-                  error={state.errors.date_of_birth}
-                  position="LEFT"
-                  maxDate={new Date()}
-                />
-              </div>
               <div>
                 <label className="mb-2">
-                  Phone Number
+                  State
                   <span className="text-red-500">{" *"}</span>
                 </label>
-                <PhoneNumberField
-                  placeholder="Phone Number"
-                  value={state.form.phone_number}
-                  onChange={(value: any) =>
-                    handleValueChange(value, "phone_number")
-                  }
-                  errors={state.errors.phone_number}
-                  onlyIndia={true}
-                />
-                <Checkbox
-                  checked={phoneIsWhatsApp}
-                  onCheck={(checked) => {
-                    setPhoneIsWhatsApp(checked);
-                    !checked && handleValueChange("+91", "alt_phone_number");
-                  }}
-                  label="Is the phone number a WhatsApp number?"
-                />
-              </div>
-
-              <div>
-                <label className="mb-2">Whatsapp Number</label>
-                <PhoneNumberField
-                  placeholder="WhatsApp Phone Number"
-                  value={state.form.alt_phone_number}
-                  onChange={(value: any) =>
-                    handleValueChange(value, "alt_phone_number")
-                  }
-                  disabled={phoneIsWhatsApp}
-                  errors={state.errors.alt_phone_number}
-                  onlyIndia={true}
-                />
+                {isStateLoading ? (
+                  <CircularProgress size={20} />
+                ) : (
+                  <>
+                    <SelectMenuV2
+                      id="state"
+                      placeholder="Choose State *"
+                      options={states}
+                      optionLabel={(o) => o.name}
+                      optionValue={(o) => o.id}
+                      value={state.form.state}
+                      onChange={(e) => {
+                        if (e) {
+                          return [
+                            handleValueChange(e, "state"),
+                            fetchDistricts(e),
+                          ];
+                        }
+                      }}
+                    />
+                    <ErrorHelperText error={state.errors.state} />
+                  </>
+                )}
               </div>
               <div>
                 <label className="mb-2">
-                  Email
+                  District
                   <span className="text-red-500">{" *"}</span>
                 </label>
-                <TextFormField
-                  id="email"
-                  name="email"
-                  value={state.form.email}
-                  onChange={handleChange}
-                  error={state.errors.email}
-                />
+                {isDistrictLoading ? (
+                  <CircularProgress size={20} />
+                ) : (
+                  <>
+                    <SelectMenuV2
+                      id="district"
+                      placeholder="Choose District"
+                      options={districts}
+                      optionLabel={(o) => o.name}
+                      optionValue={(o) => o.id}
+                      value={state.form.district}
+                      onChange={(e) => {
+                        if (e) {
+                          return [
+                            handleValueChange(e, "district"),
+                            fetchLocalBody(e),
+                          ];
+                        }
+                      }}
+                    />
+                    <ErrorHelperText error={state.errors.district} />
+                  </>
+                )}
               </div>
+              {showLocalbody && (
+                <div>
+                  <label className="mb-2">
+                    LocalBody
+                    <span className="text-red-500">{" *"}</span>
+                  </label>
+                  {isLocalbodyLoading ? (
+                    <CircularProgress size={20} />
+                  ) : (
+                    <>
+                      <SelectMenuV2
+                        id="localbody"
+                        position="above"
+                        placeholder="Choose LocalBody"
+                        options={localBodies}
+                        optionLabel={(o) => o.name}
+                        optionValue={(o) => o.id}
+                        value={state.form.local_body}
+                        onChange={(e) => handleValueChange(e, "local_body")}
+                      />
+                      <ErrorHelperText error={state.errors.local_body} />
+                    </>
+                  )}
+                </div>
+              )}
             </div>
             <div className="flex flex-col md:flex-row gap-2 justify-between mt-4">
               <Cancel onClick={() => goBack()} />
diff --git a/src/Components/Users/UserFilter.tsx b/src/Components/Users/UserFilter.tsx
index 8e311552527..a645b707182 100644
--- a/src/Components/Users/UserFilter.tsx
+++ b/src/Components/Users/UserFilter.tsx
@@ -123,6 +123,7 @@ export default function UserFilter(props: any) {
         <div className="w-full flex-none">
           <FieldLabel className="text-sm">Role</FieldLabel>
           <SelectMenuV2
+            id="role"
             placeholder="Show all"
             options={USER_TYPE_OPTIONS}
             optionLabel={(o) => o.role + ((o.readOnly && " (Read Only)") || "")}