diff --git a/client/src/Pages/Account/components/ChangePasswordModal/index.jsx b/client/src/Pages/Account/components/ChangePasswordModal/index.jsx
index 17984c3ae..b3f81eebb 100644
--- a/client/src/Pages/Account/components/ChangePasswordModal/index.jsx
+++ b/client/src/Pages/Account/components/ChangePasswordModal/index.jsx
@@ -34,7 +34,11 @@ const ChangePasswordModal = ({ isSaving, isLoading, changePassword, email }) =>
 
 		handlePasswordFeedback(updatedForm, name, value, form, errors, setErrors);
 	};
-	const isFormValid = !errors.password && !errors.confirm;
+	const isFormValid =
+		form.password.length > 1 &&
+		form.confirm.length > 1 &&
+		!errors.password &&
+		!errors.confirm;
 	const onsubmitChangePassword = async (event) => {
 		event.preventDefault();
 		if (!isFormValid) return;
@@ -57,6 +61,7 @@ const ChangePasswordModal = ({ isSaving, isLoading, changePassword, email }) =>
 			setIsLoadingSubmit(false);
 		}
 	};
+
 	return (
 		<>
 			<Button
diff --git a/server/src/controllers/v1/authController.js b/server/src/controllers/v1/authController.js
index 600c6730f..5308f92a8 100755
--- a/server/src/controllers/v1/authController.js
+++ b/server/src/controllers/v1/authController.js
@@ -467,7 +467,6 @@ class AuthController extends BaseController {
 
 			const userId = req.params.userId;
 			const updates = { ...req.body };
-			console.log("body", req.body);
 			await editUserByIdParamValidation.validateAsync(req.params);
 			await editUserPasswordByIdBodyValidation.validateAsync(req.body);
 			await this.userService.setPasswordByUserId(userId, updates);