diff --git a/server/www/teleport/static/js/user/user-list.js b/server/www/teleport/static/js/user/user-list.js
index 6db9f5e..ef2ebd8 100755
--- a/server/www/teleport/static/js/user/user-list.js
+++ b/server/www/teleport/static/js/user/user-list.js
@@ -792,9 +792,6 @@ $app.create_dlg_edit_user = function () {
             var select = parseInt($(this).attr('data-tp-selector'));
             if (dlg.field_role === select)
                 return;
-            // var name = dlg._id2name(select);
-
-            console.log(select);
 
             var name = $app.role_id2name(select);
             if (_.isUndefined(name)) {
diff --git a/server/www/teleport/view/system/config.mako b/server/www/teleport/view/system/config.mako
index bcb9763..b62e5e3 100644
--- a/server/www/teleport/view/system/config.mako
+++ b/server/www/teleport/view/system/config.mako
@@ -254,9 +254,16 @@
                         </td>
                     </tr>
                     <tr>
-                        <td class="key">会话超时</td>
+                        <td></td>
                         <td class="value">
-                            <input id="sess-noop-timeout" type="text" value="15"/><span class="unit">分钟</span><span class="desc">0~60。指定时间内远程会话没有任何数据包收发时，将此会话断开，为0则不检查。默认为15分钟。</span>
+                            <div>指定时间内远程会话没有任何数据包收发时，teleport将主动断开此会话。</div>
+                            <div class="alert alert-info">常用于ssh会话，客户端或主机端配置了KeepAlive（比如使用NO-OP防空闲指令）时，即使会话上没有任何操作和数据交互，仍然能保持连接不会中断。使用这里的会话超时设置可以将指定时间内无操作的会话强行关闭。</div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td></td>
+                        <td class="value">
+                            <input id="sess-noop-timeout" type="text" value="15"/><span class="unit">分钟内无数据收发则主动断开</span><span class="desc">0~60。为0则不做超时检查，保留会话的原始超时设置。默认为15分钟。</span>
                         </td>
                     </tr>
 
diff --git a/server/www/teleport/webroot/app/model/user.py b/server/www/teleport/webroot/app/model/user.py
index b531177..ac8cedc 100755
--- a/server/www/teleport/webroot/app/model/user.py
+++ b/server/www/teleport/webroot/app/model/user.py
@@ -642,6 +642,12 @@ def update_users_state(handler, user_ids, state):
     sql_v = (state, )
     sql_list.append({'s': sql_s, 'v': sql_v})
 
+    # 如果是解锁/解禁，同时要重置失败尝试次数
+    if state == TP_STATE_NORMAL:
+        sql_s = 'UPDATE `{tp}user` SET `fail_count`=0 WHERE `id` IN ({ids});' \
+                ''.format(tp=db.table_prefix, ids=user_ids)
+        sql_list.append({'s': sql_s, 'v': None})
+
     sql_s = 'UPDATE `{tp}ops_auz` SET `state`={ph} WHERE `rtype`={ph} AND `rid` IN ({ids});' \
             ''.format(tp=db.table_prefix, ph=db.place_holder, ids=user_ids)
     sql_v = (state, TP_USER)