diff --git a/Client/src/Components/TabPanels/ProfileSettings/PasswordPanel.jsx b/Client/src/Components/TabPanels/ProfileSettings/PasswordPanel.jsx
index 3646b5aed..56eb9a12a 100644
--- a/Client/src/Components/TabPanels/ProfileSettings/PasswordPanel.jsx
+++ b/Client/src/Components/TabPanels/ProfileSettings/PasswordPanel.jsx
@@ -24,13 +24,14 @@ const PasswordPanel = () => {
 
   //for testing, will tweak when I implement redux slice
   const idToName = {
-    "edit-current-password": "currentPassword",
-    "edit-new-password": "password",
+    "edit-current-password": "password",
+    //TBD - form field naming
+    "edit-new-password": "newpassword",
     "edit-confirm-password": "confirm",
   };
   const [localData, setLocalData] = useState({
-    currentPassword: "",
     password: "",
+    newpassword: "",
     confirm: "",
   });
   const [errors, setErrors] = useState({});
@@ -45,7 +46,7 @@ const PasswordPanel = () => {
 
     const validation = editPasswordValidation.validate(
       { [name]: value },
-      { abortEarly: false, context: { password: localData.password } }
+      { abortEarly: false, context: { newpassword: localData.newpassword } }
     );
 
     setErrors((prev) => {
@@ -66,7 +67,7 @@ const PasswordPanel = () => {
 
     const { error } = editPasswordValidation.validate(localData, {
       abortEarly: false,
-      context: { password: localData.password },
+      context: { newpassword: localData.newpassword },
     });
 
     if (error) {
diff --git a/Client/src/Validation/validation.js b/Client/src/Validation/validation.js
index 209607d9a..c2249fc93 100644
--- a/Client/src/Validation/validation.js
+++ b/Client/src/Validation/validation.js
@@ -84,12 +84,12 @@ const editProfileValidation = joi.object({
 
 const editPasswordValidation = joi.object({
   // TBD - validation for current password ?
-  currentPassword : joi
+  password : joi
   .string().trim()
   .messages({
     "string.empty": "*Current password is required.",
   }),
-  password: joi
+  newpassword: joi
     .string()
     .trim()
     .min(8)