diff --git a/cypress/e2e/auth_spec/ForgotPassword.cy.ts b/cypress/e2e/auth_spec/ForgotPassword.cy.ts
deleted file mode 100644
index c1b1db7ecad..00000000000
--- a/cypress/e2e/auth_spec/ForgotPassword.cy.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-describe("Forgot Password", () => {
-  beforeEach(() => {
-    cy.awaitUrl("/", true);
-    cy.get("button").contains("Forgot password?").click().wait(100);
-  });
-
-  it("Send Password Reset Link", () => {
-    cy.get("input[id='forgot_username']").type("dummy_user_1");
-    cy.contains("Send Reset Link").click().wait(1000);
-    cy.contains("Password Reset Email Sent").should("exist");
-  });
-
-  it("Go to Login page", () => {
-    cy.get("button").contains("Back to login").click();
-    cy.url().should("contain", "/");
-  });
-});
diff --git a/cypress/e2e/auth_spec/auth.cy.ts b/cypress/e2e/auth_spec/auth.cy.ts
deleted file mode 100644
index b2bd7b634c0..00000000000
--- a/cypress/e2e/auth_spec/auth.cy.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-describe("Authorisation/Authentication", () => {
-  beforeEach(() => {
-    cy.awaitUrl("/", true);
-  });
-
-  it("Try login as admin with correct password", () => {
-    cy.loginByApi("devdistrictadmin", "Coronasafe@123");
-    cy.awaitUrl("/facility");
-    cy.get("#user-profile-name").click();
-    cy.get("#sign-out-button").contains("Sign Out").click();
-    cy.url().should("include", "/");
-  });
-
-  it("Try login as admin with incorrect password", () => {
-    cy.log("Logging in the user: devdistrictadmin:Coronasafe@123");
-
-    cy.awaitUrl("/", true);
-    cy.get("input[id='username']").type("devdistrictadmin");
-    cy.get("input[id='password']").type("coronasafe@123");
-    cy.get("button").contains("Login").click();
-    cy.contains("No active account").should("exist");
-  });
-});
diff --git a/cypress/e2e/homepage_spec/UserLogin.cy.ts b/cypress/e2e/homepage_spec/UserLogin.cy.ts
new file mode 100644
index 00000000000..70c0624597f
--- /dev/null
+++ b/cypress/e2e/homepage_spec/UserLogin.cy.ts
@@ -0,0 +1,45 @@
+import LoginPage from "pageobject/Login/LoginPage";
+const loginPage = new LoginPage();
+
+describe("Authorisation/Authentication", () => {
+  beforeEach(() => {
+    cy.awaitUrl("/", true);
+  });
+
+  it("Try login as admin with correct password", () => {
+    loginPage.loginManuallyAsDistrictAdmin();
+    loginPage.interceptFacilityReq();
+    loginPage.verifyFacilityReq();
+    loginPage.ensureLoggedIn();
+    loginPage.clickSignOutBtn();
+    loginPage.verifyLoginPageUrl();
+  });
+
+  it("Try login as admin with incorrect password", () => {
+    loginPage.interceptLoginReq();
+    loginPage.loginManuallyAsDistrictAdmin(false);
+    loginPage.verifyLoginReq();
+    cy.verifyNotification("No active account found with the given credentials");
+  });
+});
+
+describe("Forgot Password", () => {
+  const userName = "dummy_user_1";
+  beforeEach(() => {
+    cy.awaitUrl("/", true);
+    cy.verifyAndClickElement("#forgot-pass-btn", "Forgot password?");
+  });
+
+  it("Send Password Reset Link", () => {
+    loginPage.fillUserNameInForgotPasswordForm(userName);
+    loginPage.interceptResetLinkReq();
+    loginPage.clickSendResetLinkBtn();
+    loginPage.verifyResetLinkReq();
+    cy.verifyNotification("Password Reset Email Sent");
+  });
+
+  it("Go to Login page", () => {
+    loginPage.clickBackButton();
+    loginPage.verifyLoginPageUrl();
+  });
+});
diff --git a/cypress/e2e/auth_spec/redirect.cy.ts b/cypress/e2e/homepage_spec/redirect.cy.ts
similarity index 100%
rename from cypress/e2e/auth_spec/redirect.cy.ts
rename to cypress/e2e/homepage_spec/redirect.cy.ts
diff --git a/cypress/pageobject/Login/LoginPage.ts b/cypress/pageobject/Login/LoginPage.ts
index cd5230a7772..05462537f61 100644
--- a/cypress/pageobject/Login/LoginPage.ts
+++ b/cypress/pageobject/Login/LoginPage.ts
@@ -13,16 +13,20 @@ class LoginPage {
     cy.loginByApi("staffdev", "Coronasafe@123");
   }
 
-  loginManuallyAsDistrictAdmin(): void {
+  loginManuallyAsDistrictAdmin(isCorrectCredentials: boolean = true): void {
     cy.get("input[id='username']").type("devdistrictadmin");
-    cy.get("input[id='password']").type("Coronasafe@123");
-    cy.get("button").contains("Login").click();
+    if (isCorrectCredentials) {
+      cy.get("input[id='password']").type("Coronasafe@123");
+    } else {
+      cy.get("input[id='password']").type("Corona");
+    }
+    cy.submitButton("Login");
   }
 
   loginManuallyAsNurse(): void {
     cy.get("input[id='username']").click().type("dummynurse1");
     cy.get("input[id='password']").click().type("Coronasafe@123");
-    cy.get("button").contains("Login").click();
+    cy.submitButton("Login");
   }
 
   login(username: string, password: string): void {
@@ -34,6 +38,50 @@ class LoginPage {
     cy.get("#sign-out-button").scrollIntoView();
     cy.get("#sign-out-button").contains("Sign Out").should("exist");
   }
+
+  clickSignOutBtn(): void {
+    cy.verifyAndClickElement("#sign-out-button", "Sign Out");
+  }
+
+  fillUserNameInForgotPasswordForm(userName: string): void {
+    cy.get("#forgot_username").type(userName);
+  }
+
+  clickSendResetLinkBtn(): void {
+    cy.verifyAndClickElement("#send-reset-link-btn", "Send Reset Link");
+  }
+
+  verifyLoginPageUrl(): void {
+    cy.url().should("include", "/");
+  }
+
+  clickBackButton(): void {
+    cy.verifyAndClickElement("#back-to-login-btn", "Back to login");
+  }
+
+  interceptFacilityReq(): void {
+    cy.intercept("GET", "**/api/v1/facility/**").as("getFacilities");
+  }
+
+  verifyFacilityReq(): void {
+    cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
+  }
+
+  interceptLoginReq(): void {
+    cy.intercept("POST", "**/api/v1/auth/login").as("userLogin");
+  }
+
+  verifyLoginReq(): void {
+    cy.wait("@userLogin").its("response.statusCode").should("eq", 401);
+  }
+
+  interceptResetLinkReq(): void {
+    cy.intercept("POST", "**/api/v1/password_reset").as("resetLink");
+  }
+
+  verifyResetLinkReq(): void {
+    cy.wait("@resetLink").its("response.statusCode").should("eq", 200);
+  }
 }
 
 export default LoginPage;
diff --git a/src/components/Auth/Login.tsx b/src/components/Auth/Login.tsx
index bcf0d4e3415..62f1dabccf3 100644
--- a/src/components/Auth/Login.tsx
+++ b/src/components/Auth/Login.tsx
@@ -335,6 +335,7 @@ const Login = (props: { forgot?: boolean }) => {
                             setForgotPassword(true);
                           }}
                           type="button"
+                          id="forgot-pass-btn"
                           className="text-sm text-primary-400 hover:text-primary-500"
                         >
                           {t("forget_password")}
@@ -370,6 +371,7 @@ const Login = (props: { forgot?: boolean }) => {
                     setForgotPassword(false);
                   }}
                   type="button"
+                  id="back-to-login-btn"
                   className="mb-4 text-sm text-primary-400 hover:text-primary-500"
                 >
                   <div className="flex justify-center">
@@ -403,6 +405,7 @@ const Login = (props: { forgot?: boolean }) => {
                       ) : (
                         <button
                           type="submit"
+                          id="send-reset-link-btn"
                           className="inline-flex w-full cursor-pointer items-center justify-center rounded bg-primary-500 px-4 py-2 text-sm font-semibold text-white"
                         >
                           {t("send_reset_link")}