diff --git a/ui/hand_acid_mainboard_ui.HMI b/ui/hand_acid_mainboard_ui.HMI
index 5b6f84a..905837f 100644
Binary files a/ui/hand_acid_mainboard_ui.HMI and b/ui/hand_acid_mainboard_ui.HMI differ
diff --git a/usrc/service/page/Page_login.cpp b/usrc/service/page/Page_login.cpp
index 0e0962e..223eab1 100644
--- a/usrc/service/page/Page_login.cpp
+++ b/usrc/service/page/Page_login.cpp
@@ -67,13 +67,13 @@ void Page_login::OnLoginButtonClick(uint8_t bid, const char* userName, const cha
   ZLOGI(TAG, "try login %s %s", userName, passwd);
   const char* curUsrPasswd = getPasswd(userName, &passwdcfgcache);
   if (!curUsrPasswd) {
-    UIS->alert("用户不存在");
     UIS->setVal(PAGE, OBJ(txtPasswd), "");
+    UIS->alert("用户不存在");
     return;
   }
   if (strcmp(curUsrPasswd, passwd) != 0) {
-    UIS->alert("密码错误");
     UIS->setVal(PAGE, OBJ(txtPasswd), "");
+    UIS->alert("密码错误");
     return;
   }
 
diff --git a/usrc/service/page/submenu/Page_changePasswd.cpp b/usrc/service/page/submenu/Page_changePasswd.cpp
index 5df433a..a407497 100644
--- a/usrc/service/page/submenu/Page_changePasswd.cpp
+++ b/usrc/service/page/submenu/Page_changePasswd.cpp
@@ -12,21 +12,35 @@ static CfgItermCache cfgcache;
 
 bool Page_changePasswd::isBelongThisPage(int page) { return page == PAGE; }
 
-void Page_changePasswd::OnPageLoad() {};
+void Page_changePasswd::OnPageLoad() {
+  if (!UIS->isFromPopWin()) {
+    memset(oldpasswdBuf, 0, sizeof(oldpasswdBuf));
+    memset(newpasswdBuf, 0, sizeof(newpasswdBuf));
+    memset(confirmPasswdBuf, 0, sizeof(confirmPasswdBuf));
+  }
+
+  UIS->setVal(PAGE, ob_changePasswd_oldPwd, oldpasswdBuf);
+  UIS->setVal(PAGE, ob_changePasswd_newPwd, newpasswdBuf);
+  UIS->setVal(PAGE, ob_changePasswd_newPwdCfm, confirmPasswdBuf);
+};
 
 void Page_changePasswd::OnInputFieldContentChange(uint8_t bid, const char* text) {
   static CfgItermCache usrpasswdcache;
   const char*          usrpasswd = getPasswd(GSM->getLoginUsr(), &usrpasswdcache);
   if (bid == ob_changePasswd_oldPwd) {  // 旧密码
-    strcpy(oldpasswdBuf, text);
     if (strcmp(usrpasswd, text) != 0) {
       UIS->alert("旧密码错误");
       return;
     }
+    UIS->setVal(PAGE, bid, text);
+    strcpy(oldpasswdBuf, text);
+
   } else if (bid == ob_changePasswd_newPwd) {  // 新密码
     strcpy(newpasswdBuf, text);
+    UIS->setVal(PAGE, bid, text);
   } else if (bid == ob_changePasswd_newPwdCfm) {  // 新密码确认
     strcpy(confirmPasswdBuf, text);
+    UIS->setVal(PAGE, bid, text);
   }
 }
 void Page_changePasswd::OnButton(uint8_t bid, uint8_t val) {