diff --git a/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx b/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
index 030338805..a6b05bd6d 100644
--- a/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
+++ b/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx
@@ -1,15 +1,17 @@
 import { LockOutlined } from "@ant-design/icons";
 import { Button, Form, Input, Result, Typography } from "antd";
-import React from "react";
+import React, { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import ImEXOnlineLogo from "../../assets/logo192.png";
+import { auth } from "../../firebase/firebase.utils";
 import { validatePasswordResetStart } from "../../redux/user/user.actions";
 import { selectPasswordReset } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import "./user-validate-pw-reset.styles.scss";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
 const mapStateToProps = createStructuredSelector({
   passwordReset: selectPasswordReset,
@@ -25,11 +27,34 @@ export function UserValidatePwReset({
   oobCode,
 }) {
   const { t } = useTranslation();
-
+  const [codeValid, setCodeValid] = useState({ loading: true });
   const handleFinish = (values) => {
     validatePasswordReset({ code: oobCode, password: values.password });
   };
 
+  useEffect(() => {
+    async function checkCodeValid() {
+      try {
+        const codeValid = await auth.checkActionCode(oobCode);
+        console.log("codeValid :>> ", codeValid);
+        setCodeValid({ loading: false, ...codeValid });
+      } catch (error) {
+        console.log("error :>> ", error);
+        setCodeValid({ loading: false, ...error });
+      }
+    }
+    checkCodeValid();
+  }, [oobCode]);
+
+  if (codeValid.loading) return <LoadingSpinner />;
+
+  if (codeValid.code)
+    return (
+      <div>
+        <Result status="error" title={codeValid.message} />
+      </div>
+    );
+
   if (passwordReset.success)
     return (
       <Result
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
index 1239800b0..28b274547 100644
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -195,6 +195,7 @@ export function* onValidatePasswordResetStart() {
 }
 export function* validatePasswordResetStart({ payload: { password, code } }) {
   try {
+    auth.checkActionCode(code);
     yield auth.confirmPasswordReset(code, password);
     yield put(validatePasswordResetSuccess());
   } catch (error) {
diff --git a/client/src/redux/user/user.types.js b/client/src/redux/user/user.types.js
index ddd8db75b..7728fcb53 100644
--- a/client/src/redux/user/user.types.js
+++ b/client/src/redux/user/user.types.js
@@ -29,5 +29,8 @@ const UserActionTypes = {
   VALIDATE_PASSWORD_RESET_SUCCESS: "VALIDATE_PASSWORD_RESET_SUCCESS",
   VALIDATE_PASSWORD_RESET_FAILURE: "VALIDATE_PASSWORD_RESET_FAILURE",
   SET_AUTH_LEVEL: "SET_AUTH_LEVEL",
+  CHECK_ACTION_CODE_START: "CHECK_ACTION_CODE_START",
+  CHECK_ACTION_CODE_SUCCESS: "CHECK_ACTION_CODE_SUCCESS",
+  CHECK_ACTION_CODE_FAILURE: "CHECK_ACTION_CODE_FAILURE",
 };
 export default UserActionTypes;