diff -Nur gnome-control-center-3.26.2.old/panels/user-accounts/run-passwd.c gnome-control-center-3.26.2/panels/user-accounts/run-passwd.c
--- gnome-control-center-3.26.2.old/panels/user-accounts/run-passwd.c	2018-10-27 19:31:31.154224814 +0000
+++ gnome-control-center-3.26.2/panels/user-accounts/run-passwd.c	2018-10-27 19:34:58.394200706 +0000
@@ -469,7 +469,7 @@
                                                 "different",
                                                 "wrapped",
                                                 "recovered",
-                                                "recent",
+                                                "already used",
                                                 "unchanged",
                                                 "match",
                                                 "1 numeric or special",
@@ -512,9 +512,9 @@
                                                    strstr (str->str, "wrapped") != NULL) {
                                                 error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
                                                                      _("The old and new passwords are too similar"));
-                                        } else if (strstr (str->str, "recent") != NULL) {
+                                        } else if (strstr (str->str, "already used") != NULL) {
                                                 error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
-                                                                     _("The new password has already been used recently."));
+                                                                     _("Password has been already used. Choose another."));
                                         } else if (strstr (str->str, "1 numeric or special") != NULL) {
                                                 error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
                                                                      _("The new password must contain numeric or special characters"));
diff -Nur gnome-control-center-3.26.2.old/panels/user-accounts/um-password-dialog.c gnome-control-center-3.26.2/panels/user-accounts/um-password-dialog.c
--- gnome-control-center-3.26.2.old/panels/user-accounts/um-password-dialog.c	2018-10-27 19:31:31.154224814 +0000
+++ gnome-control-center-3.26.2/panels/user-accounts/um-password-dialog.c	2018-10-27 19:36:35.291189435 +0000
@@ -143,8 +143,9 @@
                 primary_text = error->message;
                 secondary_text = _("Please choose another password.");
 
+                gtk_entry_set_text (GTK_ENTRY (um->old_password_entry), "");
+                gtk_widget_grab_focus (um->old_password_entry);
                 gtk_entry_set_text (GTK_ENTRY (um->password_entry), "");
-                gtk_widget_grab_focus (um->password_entry);
 
                 gtk_entry_set_text (GTK_ENTRY (um->verify_entry), "");
         }
diff -Nur gnome-control-center-3.26.2.old/po/zh_CN.po gnome-control-center-3.26.2/po/zh_CN.po
--- gnome-control-center-3.26.2.old/po/zh_CN.po	2018-10-27 19:31:31.070224824 +0000
+++ gnome-control-center-3.26.2/po/zh_CN.po	2018-10-27 19:38:13.743177982 +0000
@@ -6401,8 +6401,8 @@
 
 #: ../panels/user-accounts/run-passwd.c:517
 #, c-format
-msgid "The new password has already been used recently."
-msgstr "新的密码最近已使用过。"
+msgid "Password has been already used. Choose another."
+msgstr "新密码在最近已经使用过。请选用其他密码"
 
 #: ../panels/user-accounts/run-passwd.c:520
 #, c-format