diff --git a/src/login/components/LoginContext.tsx b/src/login/components/LoginContext.tsx
index 7689dfdc..6999deb2 100644
--- a/src/login/components/LoginContext.tsx
+++ b/src/login/components/LoginContext.tsx
@@ -1,5 +1,5 @@
 import {
-  createContext, FC, ReactNode, useContext, useMemo, useState,
+  createContext, Dispatch, FC, ReactNode, SetStateAction, useContext, useMemo, useState,
 } from 'react';
 
 export interface FormFields {
@@ -14,9 +14,9 @@ export interface FormErrors {
 
 interface LoginContextType {
   formFields: FormFields,
-  setFormFields: (fields: FormFields) => void,
+  setFormFields: Dispatch<SetStateAction<FormFields>>,
   errors: FormErrors,
-  setErrors: (errors: FormErrors) => void,
+  setErrors: Dispatch<SetStateAction<FormErrors>>,
 }
 
 const LoginContext = createContext<LoginContextType | undefined>(undefined);
diff --git a/src/reset-password/ResetPasswordPage.jsx b/src/reset-password/ResetPasswordPage.jsx
index fc6cc516..8e9343d8 100644
--- a/src/reset-password/ResetPasswordPage.jsx
+++ b/src/reset-password/ResetPasswordPage.jsx
@@ -17,7 +17,7 @@ import BaseContainer from '../base-container';
 import { validatePassword } from './data/api';
 import { useResetPassword, useValidateToken } from './data/apiHook';
 import {
-  FORM_SUBMISSION_ERROR, PASSWORD_RESET, PASSWORD_RESET_ERROR, PASSWORD_VALIDATION_ERROR, TOKEN_STATE,
+  FORM_SUBMISSION_ERROR, PASSWORD_RESET, PASSWORD_VALIDATION_ERROR, TOKEN_STATE,
 } from './data/constants';
 import messages from './messages';
 import ResetPasswordFailure from './ResetPasswordFailure';
@@ -47,7 +47,7 @@ const ResetPasswordPageInner = () => {
   const { mutate: resetUserPassword, isPending: isResetting } = useResetPassword();
 
   useEffect(() => {
-    if (status !== TOKEN_STATE.PENDING && status !== PASSWORD_RESET_ERROR) {
+    if (status !== TOKEN_STATE.PENDING) {
       setErrorCode(status);
     }
     if (status === PASSWORD_VALIDATION_ERROR) {
@@ -176,7 +176,7 @@ const ResetPasswordPageInner = () => {
   );
 
   useEffect(() => {
-    if (status === PASSWORD_RESET_ERROR || status === PASSWORD_RESET.INVALID_TOKEN) {
+    if (status === PASSWORD_RESET.INVALID_TOKEN) {
       navigate(updatePathWithQueryParams(RESET_PAGE), { state: { status } });
     }
     if (status === 'success') {
diff --git a/src/reset-password/tests/ResetPasswordPage.test.jsx b/src/reset-password/tests/ResetPasswordPage.test.jsx
index 686cf1a4..af358359 100644
--- a/src/reset-password/tests/ResetPasswordPage.test.jsx
+++ b/src/reset-password/tests/ResetPasswordPage.test.jsx
@@ -289,7 +289,7 @@ describe('ResetPasswordPage', () => {
   });
 
   it('should redirect the user to Reset password email screen ', async () => {
-    // Mock an error scenario that would cause PASSWORD_RESET_ERROR
+    // Mock an error scenario that triggers an error state
     mockValidateToken.mockImplementation((tokenValue, { onError }) => {
       onError({
         response: {