diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties
index e72c22be..73f812ba 100644
--- a/xxl-job-admin/src/main/resources/i18n/message.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message.properties
@@ -34,6 +34,7 @@ system_nav=导航
 system_digits=整数
 system_lengh_limit=长度限制
 system_permission_limit=权限拦截
+system_welcome=欢迎
 
 ## daterangepicker
 daterangepicker_ranges_recent_hour=最近一小时
@@ -86,6 +87,11 @@ logout_confirm=确认注销登录?
 logout_success=注销成功
 logout_fail=注销失败
 
+## change pwd
+change_pwd=修改密码
+change_pwd_suc_to_logout=修改密码成功，即将注销登陆
+change_pwd_field_newpwd=新密码
+
 ## dashboard
 job_dashboard_name=运行报表
 job_dashboard_job_num=任务数量
diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties
index 2e688dc1..b3aaa3fe 100644
--- a/xxl-job-admin/src/main/resources/i18n/message_en.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties
@@ -34,6 +34,7 @@ system_nav=Navigation
 system_digits=digits
 system_lengh_limit=Length limit
 system_permission_limit=Permission limit
+system_welcome=Welcome
 
 ## daterangepicker
 daterangepicker_ranges_recent_hour=recent one hour
@@ -86,6 +87,11 @@ logout_confirm=Confirm logout?
 logout_success=Logout success
 logout_fail=Logout fail
 
+## change pwd
+change_pwd=Change password
+change_pwd_suc_to_logout=Change password successful, about to log out login
+change_pwd_field_newpwd=new password
+
 ## dashboard
 job_dashboard_name=Run report
 job_dashboard_job_num=Job number
diff --git a/xxl-job-admin/src/main/resources/static/js/common.1.js b/xxl-job-admin/src/main/resources/static/js/common.1.js
index 190ffe36..1a3fd24c 100644
--- a/xxl-job-admin/src/main/resources/static/js/common.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/common.1.js
@@ -125,7 +125,7 @@ $(function(){
                 if (data.code == 200) {
                     $('#updatePwdModal').modal('hide');
 
-                    layer.msg( '修改密码成功，即将注销登陆' );
+                    layer.msg( I18n.change_pwd_suc_to_logout );
                     setTimeout(function(){
                         $.post(base_url + "/logout", function(data, status) {
                             if (data.code == 200) {
@@ -133,7 +133,7 @@ $(function(){
                             } else {
                                 layer.open({
                                     icon: '2',
-                                    content: (data.msg||'注销失败')
+                                    content: (data.msg|| I18n.logout_fail)
                                 });
                             }
                         });
@@ -141,7 +141,7 @@ $(function(){
                 } else {
                     layer.open({
                         icon: '2',
-                        content: (data.msg||'修改密码失败')
+                        content: (data.msg|| I18n.change_pwd + I18n.system_fail )
                     });
                 }
             });
diff --git a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl b/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl
index 015368b7..621c781a 100644
--- a/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl
+++ b/xxl-job-admin/src/main/resources/templates/common/common.macro.ftl
@@ -84,11 +84,11 @@
 					<#-- login user -->
                     <li class="dropdown">
                         <a href="javascript:" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                            欢迎 ${Request["XXL_JOB_LOGIN_IDENTITY"].username}
+                            ${I18n.system_welcome} ${Request["XXL_JOB_LOGIN_IDENTITY"].username}
                             <span class="caret"></span>
                         </a>
                         <ul class="dropdown-menu" role="menu">
-                            <li id="updatePwd" ><a href="javascript:">修改密码</a></li>
+                            <li id="updatePwd" ><a href="javascript:">${I18n.change_pwd}</a></li>
                             <li id="logoutBtn" ><a href="javascript:">${I18n.logout_btn}</a></li>
                         </ul>
                     </li>
@@ -103,19 +103,19 @@
 		<div class="modal-dialog ">
 			<div class="modal-content">
 				<div class="modal-header">
-					<h4 class="modal-title" >修改密码</h4>
+					<h4 class="modal-title" >${I18n.change_pwd}</h4>
 				</div>
 				<div class="modal-body">
 					<form class="form-horizontal form" role="form" >
 						<div class="form-group">
-							<label for="lastname" class="col-sm-2 control-label">新密码<font color="red">*</font></label>
-							<div class="col-sm-10"><input type="text" class="form-control" name="password" placeholder="请输入新密码" maxlength="100" ></div>
+							<label for="lastname" class="col-sm-2 control-label">${I18n.change_pwd_field_newpwd}<font color="red">*</font></label>
+							<div class="col-sm-10"><input type="text" class="form-control" name="password" placeholder="${I18n.system_please_input} ${I18n.change_pwd_field_newpwd}" maxlength="100" ></div>
 						</div>
 						<hr>
 						<div class="form-group">
 							<div class="col-sm-offset-3 col-sm-6">
-								<button type="submit" class="btn btn-primary"  >保存</button>
-								<button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+								<button type="submit" class="btn btn-primary"  >${I18n.system_save}</button>
+								<button type="button" class="btn btn-default" data-dismiss="modal">${I18n.system_cancel}</button>
 							</div>
 						</div>
 					</form>