diff --git a/src/components/Login/PasswordLogin.js b/src/components/Login/PasswordLogin.js
index c3d0116..3408ff6 100644
--- a/src/components/Login/PasswordLogin.js
+++ b/src/components/Login/PasswordLogin.js
@@ -59,7 +59,7 @@ const PasswordLogin = ({ color, endpoint }) => {
             setValidateMsg(t('login_lock_message'));
             timer = setTimeout(() => {
                 setIsLock(false);
-            }, 180000);
+            }, 600000);
         } else {
             setValidateMsg('');
             setTimes(0);
diff --git a/src/components/Modals/ChangePasswordModal.js b/src/components/Modals/ChangePasswordModal.js
index d7ebb8c..1e38c8b 100644
--- a/src/components/Modals/ChangePasswordModal.js
+++ b/src/components/Modals/ChangePasswordModal.js
@@ -116,7 +116,7 @@ export default function ChangePasswordModal({ color }) {
                             label={<div className="font-bold theme-text-main">{t('enter_old_password')}</div>}
                             name="oldpassword"
                             rules={[
-                                { required: true, message: t('private_key_validate_required') },
+                                { required: true, message: t('enter_old_password_placeholder') },
                                 {
                                     pattern: /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d]{8,}$/,
                                     message: t('password_validate_pattern'),