diff --git a/cypress/e2e/users_spec/user_creation.cy.ts b/cypress/e2e/users_spec/user_creation.cy.ts
index ae416d8d990..358a243efd8 100644
--- a/cypress/e2e/users_spec/user_creation.cy.ts
+++ b/cypress/e2e/users_spec/user_creation.cy.ts
@@ -120,14 +120,7 @@ describe("User Creation", () => {
   //       .click()
   //       .type("Dummy Facility 1")
   //       .wait("@getFacilities");
-  //     cy.get("li[role='option']").first().click();
-  //     cy.intercept(/\/api\/v1\/users\/\w+\/add_facility\//).as("addFacility");
-  //     cy.get("button[id='link-facility']").click();
-  //     cy.wait("@addFacility")
-  //       // .its("response.statusCode")
-  //       // .should("eq", 201)
-  //       .get("span")
-  //       .contains("Facility - User Already has permission to this facility");
+  //     cy.get("li[role='option']").should("not.exist");
   //   });
 
   // describe("Edit User Profile & Error Validation", () => {
diff --git a/src/Components/Common/FacilitySelect.tsx b/src/Components/Common/FacilitySelect.tsx
index 400ce115bc5..19494081aa3 100644
--- a/src/Components/Common/FacilitySelect.tsx
+++ b/src/Components/Common/FacilitySelect.tsx
@@ -6,6 +6,7 @@ import { FacilityModel } from "../Facility/models";
 
 interface FacilitySelectProps {
   name: string;
+  exclude_user: string;
   errors?: string | undefined;
   className?: string;
   searchAll?: boolean;
@@ -22,6 +23,7 @@ interface FacilitySelectProps {
 export const FacilitySelect = (props: FacilitySelectProps) => {
   const {
     name,
+    exclude_user,
     multiple,
     selected,
     setSelected,
@@ -45,6 +47,7 @@ export const FacilitySelect = (props: FacilitySelectProps) => {
         search_text: text,
         all: searchAll,
         facility_type: facilityType,
+        exclude_user: exclude_user,
         district,
       };
 
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index 3b55c40fc70..1771a6ca22f 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -706,6 +706,7 @@ function UserFacilities(props: { user: any }) {
         <FacilitySelect
           multiple={false}
           name="facility"
+          exclude_user={username}
           showAll={false} // Show only facilities that user has access to link (not all facilities)
           showNOptions={8}
           selected={facility}