From 4645bde0250d4a9cb476c01757d9f119a4cf6a35 Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Sun, 25 Jan 2026 15:19:21 +0000
Subject: [PATCH 1/9] Allow all users to change password and handle expired
 sessions

---
 client/package-lock.json                         |  2 +-
 .../Pages/Account/components/PasswordPanel.jsx   | 16 ++++++++++++++--
 client/src/Pages/Account/index.jsx               |  2 +-
 client/src/locales/en.json                       |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 7f5397b7f..282ab2611 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -38,7 +38,7 @@
 				"react-toastify": "^10.0.5",
 				"recharts": "2.15.2",
 				"redux-persist": "6.0.0",
-				"swr": "2.3.6",
+				"swr": "^2.3.6",
 				"vite-plugin-svgr": "^4.2.0",
 				"zod": "4.1.11"
 			},
diff --git a/client/src/Pages/Account/components/PasswordPanel.jsx b/client/src/Pages/Account/components/PasswordPanel.jsx
index f54c61a16..f06555dcd 100644
--- a/client/src/Pages/Account/components/PasswordPanel.jsx
+++ b/client/src/Pages/Account/components/PasswordPanel.jsx
@@ -11,6 +11,8 @@ import { useDispatch, useSelector } from "react-redux";
 import { createToast } from "../../../Utils/toastUtils.jsx";
 import { getTouchedFieldErrors } from "../../../Validation/error.js";
 import { useTranslation } from "react-i18next";
+import { useNavigate } from "react-router-dom";
+import { clearAuthState } from "../../../Features/Auth/authSlice.js";
 
 const defaultPasswordsState = {
 	password: "",
@@ -28,11 +30,12 @@ const PasswordPanel = () => {
 	const theme = useTheme();
 	const dispatch = useDispatch();
 	const { t } = useTranslation();
+	const navigate = useNavigate();
 
 	const SPACING_GAP = theme.spacing(12);
 
 	//redux state
-	const { isLoading } = useSelector((state) => state.auth);
+	const { isLoading, authToken } = useSelector((state) => state.auth);
 
 	const idToName = {
 		"edit-current-password": "password",
@@ -79,6 +82,16 @@ const PasswordPanel = () => {
 	const handleSubmit = async (event) => {
 		event.preventDefault();
 
+		// Check for expired/invalid token before submitting
+		if (!authToken) {
+			createToast({
+				body: t("passwordPanel.sessionExpired", "Your session has expired. Please log in again."),
+			});
+			dispatch(clearAuthState());
+			navigate("/login");
+			return;
+		}
+
 		const { error } = newOrChangedCredentials.validate(localData, {
 			abortEarly: false,
 			context: { password: localData.newPassword },
@@ -105,7 +118,6 @@ const PasswordPanel = () => {
 					confirm: "",
 				});
 			} else {
-				// TODO: Check for other errors?
 				createToast({
 					body: t(
 						"passwordPanel.passwordInputIncorrect",
diff --git a/client/src/Pages/Account/index.jsx b/client/src/Pages/Account/index.jsx
index ae16ff9d7..3bf480336 100644
--- a/client/src/Pages/Account/index.jsx
+++ b/client/src/Pages/Account/index.jsx
@@ -85,7 +85,7 @@ const Account = ({ open = "profile" }) => {
 					))}
 				</CustomTabList>
 				<ProfilePanel />
-				{user.role.includes("superadmin") && <PasswordPanel />}
+				<PasswordPanel />
 				{!hideTeams && <TeamPanel />}
 			</TabContext>
 		</Box>
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index de02815b1..7e5eb7092 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -555,7 +555,7 @@
 		"enterNewPassword": "Enter your new password",
 		"confirmNewPassword": "Confirm new password",
 		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character (!?@#$%^&*()-_=+[]{}|;:'\",./\\~`).",
-		"saving": "Saving..."
+		"sessionExpired": "Your session has expired, please log in again to continue."
 	},
 	"emailSent": "Email sent successfully",
 	"failedToSendEmail": "Failed to send email",

From 14a08a303be5bb8142df51d382c2d523663dd10f Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Sun, 25 Jan 2026 15:45:34 +0000
Subject: [PATCH 2/9] Fix helper text to correctly use translation to display
 message not key

---
 client/src/Pages/Account/components/PasswordPanel.jsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/src/Pages/Account/components/PasswordPanel.jsx b/client/src/Pages/Account/components/PasswordPanel.jsx
index f06555dcd..427c263ea 100644
--- a/client/src/Pages/Account/components/PasswordPanel.jsx
+++ b/client/src/Pages/Account/components/PasswordPanel.jsx
@@ -85,7 +85,10 @@ const PasswordPanel = () => {
 		// Check for expired/invalid token before submitting
 		if (!authToken) {
 			createToast({
-				body: t("passwordPanel.sessionExpired", "Your session has expired. Please log in again."),
+				body: t(
+					"passwordPanel.sessionExpired",
+					"Your session has expired. Please log in again."
+				),
 			});
 			dispatch(clearAuthState());
 			navigate("/login");
@@ -179,7 +182,7 @@ const PasswordPanel = () => {
 						value={localData.password}
 						onChange={handleChange}
 						error={errors[idToName["edit-current-password"]] ? true : false}
-						helperText={errors[idToName["edit-current-password"]]}
+						helperText={t(errors[idToName["edit-current-password"]])}
 						endAdornment={<PasswordEndAdornment />}
 						flex={1}
 					/>
@@ -205,7 +208,7 @@ const PasswordPanel = () => {
 						value={localData.newPassword}
 						onChange={handleChange}
 						error={errors[idToName["edit-new-password"]] ? true : false}
-						helperText={errors[idToName["edit-new-password"]]}
+						helperText={t(errors[idToName["edit-new-password"]])}
 						endAdornment={<PasswordEndAdornment />}
 						flex={1}
 					/>
@@ -231,7 +234,7 @@ const PasswordPanel = () => {
 						value={localData.confirm}
 						onChange={handleChange}
 						error={errors[idToName["edit-confirm-password"]] ? true : false}
-						helperText={errors[idToName["edit-confirm-password"]]}
+						helperText={t(errors[idToName["edit-confirm-password"]])}
 						endAdornment={<PasswordEndAdornment />}
 						flex={1}
 					/>

From f564636cb435e6076f50f58fbf16c59c2adaa92c Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Sun, 25 Jan 2026 19:11:25 +0000
Subject: [PATCH 3/9] Fix missingKey warning with helper text

---
 .../Account/components/PasswordPanel.jsx      | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/client/src/Pages/Account/components/PasswordPanel.jsx b/client/src/Pages/Account/components/PasswordPanel.jsx
index 427c263ea..1c365804f 100644
--- a/client/src/Pages/Account/components/PasswordPanel.jsx
+++ b/client/src/Pages/Account/components/PasswordPanel.jsx
@@ -182,7 +182,12 @@ const PasswordPanel = () => {
 						value={localData.password}
 						onChange={handleChange}
 						error={errors[idToName["edit-current-password"]] ? true : false}
-						helperText={t(errors[idToName["edit-current-password"]])}
+						helperText={
+							//Only call t() if there is an error to prevent unnecessary localization calls
+							errors[idToName["edit-current-password"]]
+								? t(errors[idToName["edit-current-password"]])
+								: ""
+						}
 						endAdornment={<PasswordEndAdornment />}
 						flex={1}
 					/>
@@ -208,7 +213,12 @@ const PasswordPanel = () => {
 						value={localData.newPassword}
 						onChange={handleChange}
 						error={errors[idToName["edit-new-password"]] ? true : false}
-						helperText={t(errors[idToName["edit-new-password"]])}
+						helperText={
+							//Only call t() if there is an error to prevent unnecessary localization calls
+							errors[idToName["edit-new-password"]]
+								? t(errors[idToName["edit-new-password"]])
+								: ""
+						}
 						endAdornment={<PasswordEndAdornment />}
 						flex={1}
 					/>
@@ -234,7 +244,12 @@ const PasswordPanel = () => {
 						value={localData.confirm}
 						onChange={handleChange}
 						error={errors[idToName["edit-confirm-password"]] ? true : false}
-						helperText={t(errors[idToName["edit-confirm-password"]])}
+						helperText={
+							//Only call t() if there is an error to prevent unnecessary localization calls
+							errors[idToName["edit-confirm-password"]]
+								? t(errors[idToName["edit-confirm-password"]])
+								: ""
+						}
 						endAdornment={<PasswordEndAdornment />}
 						flex={1}
 					/>

From 4ce4a124d640bf5809577dc9e44ee20817d4c1ec Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Sun, 25 Jan 2026 22:57:36 +0000
Subject: [PATCH 4/9] Refactor PasswordPanel to pass navigation context via
 state to ForgotPassword using TextLink | Update ForgotPassword and CheckEmail
 to handle navigation context for Back links, ensuring users return to the
 correct page after password reset | Fix TextLink prop usage to avoid warnings
 by passing state and href correctly | Ensure error messages and navigation
 links use translation keys for localization

---
 client/src/Components/v1/TextLink/index.jsx   |  4 +++-
 .../Account/components/PasswordPanel.jsx      | 13 +++++++++++--
 client/src/Pages/Auth/CheckEmail.jsx          | 13 ++++++++++---
 client/src/Pages/Auth/ForgotPassword.jsx      | 19 ++++++++++++++-----
 client/src/locales/en.json                    |  3 +++
 5 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/client/src/Components/v1/TextLink/index.jsx b/client/src/Components/v1/TextLink/index.jsx
index 83ae251a5..e226250a6 100644
--- a/client/src/Components/v1/TextLink/index.jsx
+++ b/client/src/Components/v1/TextLink/index.jsx
@@ -5,7 +5,7 @@ import PropTypes from "prop-types";
 import { useTheme } from "@emotion/react";
 import { Link as RouterLink } from "react-router-dom";
 
-const TextLink = ({ text, linkText, href, target = "_self" }) => {
+const TextLink = ({ text, linkText, href, state, target = "_self" }) => {
 	const theme = useTheme();
 
 	return (
@@ -19,6 +19,7 @@ const TextLink = ({ text, linkText, href, target = "_self" }) => {
 				to={href}
 				component={RouterLink}
 				target={target}
+				state={state}
 			>
 				{linkText}
 			</Link>
@@ -30,6 +31,7 @@ TextLink.propTypes = {
 	text: PropTypes.string,
 	linkText: PropTypes.string,
 	href: PropTypes.string,
+	state: PropTypes.object,
 	target: PropTypes.string,
 };
 
diff --git a/client/src/Pages/Account/components/PasswordPanel.jsx b/client/src/Pages/Account/components/PasswordPanel.jsx
index 1c365804f..7deb6dc8c 100644
--- a/client/src/Pages/Account/components/PasswordPanel.jsx
+++ b/client/src/Pages/Account/components/PasswordPanel.jsx
@@ -13,6 +13,8 @@ import { getTouchedFieldErrors } from "../../../Validation/error.js";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import { clearAuthState } from "../../../Features/Auth/authSlice.js";
+import TextLink from "@/Components/v1/TextLink/index.jsx";
+import { useLocation } from "react-router-dom";
 
 const defaultPasswordsState = {
 	password: "",
@@ -31,6 +33,7 @@ const PasswordPanel = () => {
 	const dispatch = useDispatch();
 	const { t } = useTranslation();
 	const navigate = useNavigate();
+	const location = useLocation();
 
 	const SPACING_GAP = theme.spacing(12);
 
@@ -267,8 +270,15 @@ const PasswordPanel = () => {
 				)}
 				<Stack
 					direction="row"
-					justifyContent="flex-end"
+					justifyContent="space-between"
+					alignItems="center"
 				>
+					<TextLink
+						text={t("passwordPanel.forgotPasswordText", "Forgot password?")}
+						linkText={t("passwordPanel.resetPasswordText", "Reset password")}
+						state={{ from: location.pathname }}
+						href={"/forgot-password"}
+					/>
 					<Button
 						variant="contained"
 						color="accent"
@@ -281,7 +291,6 @@ const PasswordPanel = () => {
 						}
 						sx={{
 							px: theme.spacing(12),
-							mt: theme.spacing(20),
 						}}
 					>
 						{t("commonSave", "Save")}
diff --git a/client/src/Pages/Auth/CheckEmail.jsx b/client/src/Pages/Auth/CheckEmail.jsx
index 95261a768..3667810b2 100644
--- a/client/src/Pages/Auth/CheckEmail.jsx
+++ b/client/src/Pages/Auth/CheckEmail.jsx
@@ -2,7 +2,7 @@ import { Box, Button, Stack, Typography } from "@mui/material";
 import { useEffect, useState } from "react";
 import { useTheme } from "@emotion/react";
 import { useDispatch } from "react-redux";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useLocation } from "react-router-dom";
 import { createToast } from "../../Utils/toastUtils.jsx";
 import { forgotPassword } from "../../Features/Auth/authSlice.js";
 import { Trans, useTranslation } from "react-i18next";
@@ -17,6 +17,7 @@ const CheckEmail = () => {
 	const navigate = useNavigate();
 	const dispatch = useDispatch();
 	const { t } = useTranslation();
+	const location = useLocation();
 
 	const [email, setEmail] = useState();
 	const [disabled, setDisabled] = useState(false);
@@ -83,7 +84,9 @@ const CheckEmail = () => {
 
 	const handleNavigate = () => {
 		sessionStorage.removeItem("email");
-		navigate("/login");
+		location.state?.from
+			? navigate(location.state.from, { replace: true })
+			: navigate("/login");
 	};
 
 	return (
@@ -219,7 +222,11 @@ const CheckEmail = () => {
 			>
 				<Typography display="inline-block">
 					<Trans
-						i18nKey="auth.forgotPassword.links.login"
+						i18nKey={
+							location.state?.from === "/account/password"
+								? "auth.forgotPassword.links.accountPassword"
+								: "auth.forgotPassword.links.login"
+						}
 						components={{
 							a: (
 								<Typography
diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index e6ba4c1f7..e07b9a005 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -5,7 +5,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { forgotPassword } from "../../Features/Auth/authSlice.js";
 import { useEffect, useState } from "react";
 import { newOrChangedCredentials } from "../../Validation/validation.js";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useLocation } from "react-router-dom";
 import TextInput from "@/Components/v1/Inputs/TextInput/index.jsx";
 import Logo from "@/assets/icons/checkmate-icon.svg?react";
 import Background from "@/assets/Images/background-grid.svg?react";
@@ -18,6 +18,7 @@ const ForgotPassword = () => {
 	const navigate = useNavigate();
 	const dispatch = useDispatch();
 	const theme = useTheme();
+	const location = useLocation();
 
 	const { isLoading } = useSelector((state) => state.auth);
 	const [errors, setErrors] = useState({});
@@ -51,11 +52,13 @@ const ForgotPassword = () => {
 			const action = await dispatch(forgotPassword(form));
 			if (action.payload.success) {
 				sessionStorage.setItem("email", form.email);
-				navigate("/check-email");
+				navigate("/check-email", {
+					state: location.state || { from: "/login" }  // Preserve original from, fallback to login
+				});
 				createToast({
 					body: t("auth.forgotPassword.toasts.sent").replace("<email/>", form.email),
 				});
-			} else {
+				} else {
 				if (action.payload) {
 					// dispatch errors
 					createToast({
@@ -86,7 +89,9 @@ const ForgotPassword = () => {
 
 	const handleNavigate = () => {
 		sessionStorage.removeItem("email");
-		navigate("/login");
+		location.state?.from
+			? navigate(location.state.from, { replace: true })
+			: navigate("/login");
 	};
 
 	return (
@@ -212,7 +217,11 @@ const ForgotPassword = () => {
 			>
 				<Typography display="inline-block">
 					<Trans
-						i18nKey="auth.forgotPassword.links.login"
+						i18nKey={
+							location.state?.from
+								? "auth.forgotPassword.links.accountPassword"
+								: "auth.forgotPassword.links.login"
+						}
 						components={{
 							a: (
 								<Typography
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 7e5eb7092..1ebb3b3e0 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -547,6 +547,7 @@
 	"incidentsPageTitle": "Incidents",
 	"checksPageTitle": "Checks",
 	"passwordPanel": {
+		"forgotPasswordText": "Forgot password?",
 		"passwordChangedSuccess": "Your password was changed successfully.",
 		"passwordInputIncorrect": "Your password input was incorrect.",
 		"currentPassword": "Current password",
@@ -555,6 +556,7 @@
 		"enterNewPassword": "Enter your new password",
 		"confirmNewPassword": "Confirm new password",
 		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character (!?@#$%^&*()-_=+[]{}|;:'\",./\\~`).",
+		"resetPasswordText": "Reset password",
 		"sessionExpired": "Your session has expired, please log in again to continue."
 	},
 	"emailSent": "Email sent successfully",
@@ -744,6 +746,7 @@
 			},
 			"links": {
 				"login": "Go back to <a>Log In</a>",
+				"accountPassword": "Go back to <a>Account Password</a>",
 				"resend": "Didn't receive the email? <a>Click to resend</a>"
 			},
 			"toasts": {

From 04cf47544aa85b181047b4247328242322f55c04 Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Sun, 25 Jan 2026 23:45:31 +0000
Subject: [PATCH 5/9] Fix ForgotPassword format

---
 client/src/Pages/Auth/ForgotPassword.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index e07b9a005..1ebe67a58 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -53,12 +53,12 @@ const ForgotPassword = () => {
 			if (action.payload.success) {
 				sessionStorage.setItem("email", form.email);
 				navigate("/check-email", {
-					state: location.state || { from: "/login" }  // Preserve original from, fallback to login
+					state: location.state || { from: "/login" }, // Preserve original from, fallback to login
 				});
 				createToast({
 					body: t("auth.forgotPassword.toasts.sent").replace("<email/>", form.email),
 				});
-				} else {
+			} else {
 				if (action.payload) {
 					// dispatch errors
 					createToast({

From 69f95723f1546a48b4ed60a0f54a9637ab3f2151 Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Mon, 2 Feb 2026 22:19:27 +0000
Subject: [PATCH 6/9] Combine useNavigate and useLocation into one import

---
 client/src/Pages/Account/components/PasswordPanel.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/Pages/Account/components/PasswordPanel.jsx b/client/src/Pages/Account/components/PasswordPanel.jsx
index 7deb6dc8c..1ac070035 100644
--- a/client/src/Pages/Account/components/PasswordPanel.jsx
+++ b/client/src/Pages/Account/components/PasswordPanel.jsx
@@ -11,10 +11,9 @@ import { useDispatch, useSelector } from "react-redux";
 import { createToast } from "../../../Utils/toastUtils.jsx";
 import { getTouchedFieldErrors } from "../../../Validation/error.js";
 import { useTranslation } from "react-i18next";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useLocation } from "react-router-dom";
 import { clearAuthState } from "../../../Features/Auth/authSlice.js";
 import TextLink from "@/Components/v1/TextLink/index.jsx";
-import { useLocation } from "react-router-dom";
 
 const defaultPasswordsState = {
 	password: "",

From 090d0025784d85305e8cd81eb8758512f1ea849b Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Tue, 3 Feb 2026 16:44:15 +0000
Subject: [PATCH 7/9] Add comment to PasswordPanel to encourage additional
 error handling and remove helperText comments | Remove explicit special
 characters from en.json

---
 client/src/Pages/Account/components/PasswordPanel.jsx | 4 +---
 client/src/locales/en.json                            | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/client/src/Pages/Account/components/PasswordPanel.jsx b/client/src/Pages/Account/components/PasswordPanel.jsx
index 1ac070035..841dca628 100644
--- a/client/src/Pages/Account/components/PasswordPanel.jsx
+++ b/client/src/Pages/Account/components/PasswordPanel.jsx
@@ -123,6 +123,7 @@ const PasswordPanel = () => {
 					confirm: "",
 				});
 			} else {
+				// TODO: Check for other errors?
 				createToast({
 					body: t(
 						"passwordPanel.passwordInputIncorrect",
@@ -185,7 +186,6 @@ const PasswordPanel = () => {
 						onChange={handleChange}
 						error={errors[idToName["edit-current-password"]] ? true : false}
 						helperText={
-							//Only call t() if there is an error to prevent unnecessary localization calls
 							errors[idToName["edit-current-password"]]
 								? t(errors[idToName["edit-current-password"]])
 								: ""
@@ -216,7 +216,6 @@ const PasswordPanel = () => {
 						onChange={handleChange}
 						error={errors[idToName["edit-new-password"]] ? true : false}
 						helperText={
-							//Only call t() if there is an error to prevent unnecessary localization calls
 							errors[idToName["edit-new-password"]]
 								? t(errors[idToName["edit-new-password"]])
 								: ""
@@ -247,7 +246,6 @@ const PasswordPanel = () => {
 						onChange={handleChange}
 						error={errors[idToName["edit-confirm-password"]] ? true : false}
 						helperText={
-							//Only call t() if there is an error to prevent unnecessary localization calls
 							errors[idToName["edit-confirm-password"]]
 								? t(errors[idToName["edit-confirm-password"]])
 								: ""
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 52ec0f3cc..419c38608 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -557,7 +557,7 @@
 		"newPassword": "New password",
 		"enterNewPassword": "Enter your new password",
 		"confirmNewPassword": "Confirm new password",
-		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character (!?@#$%^&*()-_=+[]{}|;:'\",./\\~`).",
+		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
 		"resetPasswordText": "Reset password",
 		"sessionExpired": "Your session has expired, please log in again to continue."
 	},

From 88d539b2a4e34622ac1d8c3959f68ab5be84a61a Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Wed, 4 Feb 2026 23:32:14 +0000
Subject: [PATCH 8/9] Hard coded strings to avoid en.json conflicts

---
 client/src/Pages/Account/components/PasswordPanel.jsx | 9 +++------
 client/src/Pages/Auth/CheckEmail.jsx                  | 2 +-
 client/src/Pages/Auth/ForgotPassword.jsx              | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/client/src/Pages/Account/components/PasswordPanel.jsx b/client/src/Pages/Account/components/PasswordPanel.jsx
index 841dca628..b2a7d8ee0 100644
--- a/client/src/Pages/Account/components/PasswordPanel.jsx
+++ b/client/src/Pages/Account/components/PasswordPanel.jsx
@@ -87,10 +87,7 @@ const PasswordPanel = () => {
 		// Check for expired/invalid token before submitting
 		if (!authToken) {
 			createToast({
-				body: t(
-					"passwordPanel.sessionExpired",
-					"Your session has expired. Please log in again."
-				),
+				body: "Your session has expired. Please log in again.",
 			});
 			dispatch(clearAuthState());
 			navigate("/login");
@@ -271,8 +268,8 @@ const PasswordPanel = () => {
 					alignItems="center"
 				>
 					<TextLink
-						text={t("passwordPanel.forgotPasswordText", "Forgot password?")}
-						linkText={t("passwordPanel.resetPasswordText", "Reset password")}
+						text={"Forgot password?"}
+						linkText={"Reset password"}
 						state={{ from: location.pathname }}
 						href={"/forgot-password"}
 					/>
diff --git a/client/src/Pages/Auth/CheckEmail.jsx b/client/src/Pages/Auth/CheckEmail.jsx
index 3667810b2..10cc2ecc6 100644
--- a/client/src/Pages/Auth/CheckEmail.jsx
+++ b/client/src/Pages/Auth/CheckEmail.jsx
@@ -224,7 +224,7 @@ const CheckEmail = () => {
 					<Trans
 						i18nKey={
 							location.state?.from === "/account/password"
-								? "auth.forgotPassword.links.accountPassword"
+								? "Go back to <a>Account Password</a>"
 								: "auth.forgotPassword.links.login"
 						}
 						components={{
diff --git a/client/src/Pages/Auth/ForgotPassword.jsx b/client/src/Pages/Auth/ForgotPassword.jsx
index 1ebe67a58..1dee3b125 100644
--- a/client/src/Pages/Auth/ForgotPassword.jsx
+++ b/client/src/Pages/Auth/ForgotPassword.jsx
@@ -219,7 +219,7 @@ const ForgotPassword = () => {
 					<Trans
 						i18nKey={
 							location.state?.from
-								? "auth.forgotPassword.links.accountPassword"
+								? "Go back to <a>Account Password</a>"
 								: "auth.forgotPassword.links.login"
 						}
 						components={{

From 278ced2a6c810007346473d6ebe403da25089827 Mon Sep 17 00:00:00 2001
From: llpingll <94099281+llpingll@users.noreply.github.com>
Date: Wed, 4 Feb 2026 23:56:16 +0000
Subject: [PATCH 9/9] Removed additional lines to avoid en.json conflict

---
 client/src/locales/en.json | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index 419c38608..0e85ea7d5 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -550,16 +550,10 @@
 	"navControls": "Controls",
 	"incidentsPageTitle": "Incidents",
 	"passwordPanel": {
-		"forgotPasswordText": "Forgot password?",
-		"passwordChangedSuccess": "Your password was changed successfully.",
-		"passwordInputIncorrect": "Your password input was incorrect.",
 		"currentPassword": "Current password",
 		"newPassword": "New password",
 		"enterNewPassword": "Enter your new password",
-		"confirmNewPassword": "Confirm new password",
-		"passwordRequirements": "New password must contain at least 8 characters and must have at least one uppercase letter, one lowercase letter, one number and one special character.",
-		"resetPasswordText": "Reset password",
-		"sessionExpired": "Your session has expired, please log in again to continue."
+		"confirmNewPassword": "Confirm new password"
 	},
 	"failedToSendEmail": "Failed to send email",
 	"settingsTestEmailSuccess": "Test email sent successfully",
@@ -667,7 +661,6 @@
 			},
 			"links": {
 				"login": "Go back to <a>Log In</a>",
-				"accountPassword": "Go back to <a>Account Password</a>",
 				"resend": "Didn't receive the email? <a>Click to resend</a>"
 			},
 			"toasts": {