diff --git a/server/www/teleport/app/eom_app/controller/auth.py b/server/www/teleport/app/eom_app/controller/auth.py
index f88c4a9..75896c5 100644
--- a/server/www/teleport/app/eom_app/controller/auth.py
+++ b/server/www/teleport/app/eom_app/controller/auth.py
@@ -142,18 +142,19 @@ class ModifyPwd(TPBaseUserAuthJsonHandler):
         if args is not None:
             args = json.loads(args)
         else:
-            self.write_json(-1)
+            self.write_json(-11)
             return
         _old_pwd = args['o_pwd']
         _new_pwd = args['n_pwd']
 
         if _old_pwd is None or _new_pwd is None:
-            self.write_json(-1)
+            self.write_json(-12)
             return
 
         user_info = self.get_current_user()
         try:
             ret = user.modify_pwd(_old_pwd, _new_pwd, user_info['id'])
-            self.write_json(0, ret)
+            self.write_json(ret)
         except:
-            self.write_json(-1)
+            log.e('modify password failed.')
+            self.write_json(-13)
diff --git a/server/www/teleport/static/js/ui/pwd.js b/server/www/teleport/static/js/ui/pwd.js
index c529679..9da6f19 100644
--- a/server/www/teleport/static/js/ui/pwd.js
+++ b/server/www/teleport/static/js/ui/pwd.js
@@ -1,45 +1,45 @@
-/**
- * Created by mi on 2016/7/4.
- */
-
-ywl.clear_input = function() {
-	$("#current-pwd").val('');
-	$("#new-pwd-1").val('');
-	$("#new-pwd-2").val('');
-};
-
-ywl.on_init = function (cb_stack, cb_args) {
-	$("#btn-modify-pwd").click(function () {
-		var old_pwd = $("#current-pwd").val();
-		var new_pwd_1 = $("#new-pwd-1").val();
-		var new_pwd_2 = $("#new-pwd-2").val();
-		if(old_pwd.length == 0) {
-			ywl.notify_error('请输入当前密码！');
-			return;
-		}
-		if(new_pwd_1.length == 0) {
-			ywl.notify_error('请设置新密码！');
-			return;
-		}
-		if (new_pwd_1 != new_pwd_2) {
-			ywl.notify_error('两次密码输入不一致！');
-			return;
-		}
-		ywl.ajax_post_json('/auth/modify-pwd', {o_pwd: old_pwd, n_pwd: new_pwd_1, callback: 1},
-			function (ret) {
-				if (ret.data.code == 0) {
-					ywl.notify_success('密码修改成功！');
-					ywl.clear_input();
-				} else if (ret.data.code == -2) {
-					ywl.notify_error('密码错误！');
-				} else {
-					ywl.notify_error('密码修改失败！');
-				}
-
-			},
-			function () {
-				ywl.notify_error('密码修改失败！');
-			}
-		);
-	});
+/**
+ * Created by mi on 2016/7/4.
+ */
+
+ywl.clear_input = function() {
+	$("#current-pwd").val('');
+	$("#new-pwd-1").val('');
+	$("#new-pwd-2").val('');
+};
+
+ywl.on_init = function (cb_stack, cb_args) {
+	$("#btn-modify-pwd").click(function () {
+		var old_pwd = $("#current-pwd").val();
+		var new_pwd_1 = $("#new-pwd-1").val();
+		var new_pwd_2 = $("#new-pwd-2").val();
+		if(old_pwd.length == 0) {
+			ywl.notify_error('请输入当前密码！');
+			return;
+		}
+		if(new_pwd_1.length == 0) {
+			ywl.notify_error('请设置新密码！');
+			return;
+		}
+		if (new_pwd_1 != new_pwd_2) {
+			ywl.notify_error('两次密码输入不一致！');
+			return;
+		}
+		ywl.ajax_post_json('/auth/modify-pwd', {o_pwd: old_pwd, n_pwd: new_pwd_1, callback: 1},
+			function (ret) {
+				if (ret.code == 0) {
+					ywl.notify_success('密码修改成功！');
+					ywl.clear_input();
+				} else if (ret.code == -2) {
+					ywl.notify_error('密码错误！');
+				} else {
+					ywl.notify_error('密码修改失败！errcode:'+ret.code);
+				}
+
+			},
+			function () {
+				ywl.notify_error('密码修改失败！');
+			}
+		);
+	});
 };
\ No newline at end of file