diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index 91f3da1cb..179376828 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -222,7 +222,6 @@ class Config(dict):
 
         'TERMINAL_PASSWORD_AUTH': True,
         'TERMINAL_PUBLIC_KEY_AUTH': True,
-        'TERMINAL_ONLY_SOURCE_LOCAL_CAN_PUBLIC_KEY_AUTH': True,
         'TERMINAL_HEARTBEAT_INTERVAL': 20,
         'TERMINAL_ASSET_LIST_SORT_BY': 'hostname',
         'TERMINAL_ASSET_LIST_PAGE_SIZE': 'auto',
diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py
index 31b5d52ac..936b27582 100644
--- a/apps/jumpserver/settings/custom.py
+++ b/apps/jumpserver/settings/custom.py
@@ -124,4 +124,3 @@ FORGOT_PASSWORD_URL = CONFIG.FORGOT_PASSWORD_URL
 # 自定义默认组织名
 GLOBAL_ORG_DISPLAY_NAME = CONFIG.GLOBAL_ORG_DISPLAY_NAME
 HEALTH_CHECK_TOKEN = CONFIG.HEALTH_CHECK_TOKEN
-TERMINAL_ONLY_SOURCE_LOCAL_CAN_PUBLIC_KEY_AUTH = CONFIG.TERMINAL_ONLY_SOURCE_LOCAL_CAN_PUBLIC_KEY_AUTH
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 4e146d83b..78b235d0e 100644
Binary files a/apps/locale/zh/LC_MESSAGES/django.mo and b/apps/locale/zh/LC_MESSAGES/django.mo differ
diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 49694c4a0..e24c71c54 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-14 17:52+0800\n"
+"POT-Creation-Date: 2021-04-26 10:14+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -25,20 +25,11 @@ msgstr ""
 #: orgs/models.py:23 perms/models/base.py:49 settings/models.py:29
 #: terminal/models/storage.py:23 terminal/models/storage.py:90
 #: terminal/models/task.py:16 terminal/models/terminal.py:100
-#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:530
+#: users/forms/profile.py:32 users/models/group.py:15 users/models/user.py:535
 #: users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_asset_permission.html:37
 #: users/templates/users/user_asset_permission.html:154
 #: users/templates/users/user_database_app_permission.html:36
-#: users/templates/users/user_detail.html:49
-#: users/templates/users/user_granted_database_app.html:34
-#: users/templates/users/user_granted_remote_app.html:34
-#: users/templates/users/user_group_detail.html:50
-#: users/templates/users/user_group_list.html:14
-#: users/templates/users/user_list.html:14
-#: users/templates/users/user_profile.html:51
-#: users/templates/users/user_pubkey_update.html:57
-#: users/templates/users/user_remote_app_permission.html:36
 #: xpack/plugins/cloud/models.py:28
 msgid "Name"
 msgstr "名称"
@@ -56,8 +47,6 @@ msgstr "优先级可选范围为 1-100 (数值越小越优先)"
 #: acls/models/base.py:31 authentication/models.py:20
 #: authentication/templates/authentication/_access_key_modal.html:32
 #: perms/models/base.py:52 users/templates/users/_select_user_modal.html:18
-#: users/templates/users/user_detail.html:132
-#: users/templates/users/user_profile.html:63
 msgid "Active"
 msgstr "激活中"
 
@@ -72,13 +61,7 @@ msgstr "激活中"
 #: orgs/models.py:26 perms/models/base.py:57 settings/models.py:34
 #: terminal/models/storage.py:29 terminal/models/storage.py:96
 #: terminal/models/terminal.py:114 tickets/models/ticket.py:73
-#: users/models/group.py:16 users/models/user.py:563
-#: users/templates/users/user_detail.html:115
-#: users/templates/users/user_granted_database_app.html:38
-#: users/templates/users/user_granted_remote_app.html:37
-#: users/templates/users/user_group_detail.html:62
-#: users/templates/users/user_group_list.html:16
-#: users/templates/users/user_profile.html:138
+#: users/models/group.py:16 users/models/user.py:568
 #: xpack/plugins/change_auth_plan/models.py:77 xpack/plugins/cloud/models.py:35
 #: xpack/plugins/cloud/models.py:98 xpack/plugins/gathered_user/models.py:26
 msgid "Comment"
@@ -104,9 +87,6 @@ msgstr "登录IP"
 #: users/templates/users/user_asset_permission.html:44
 #: users/templates/users/user_asset_permission.html:79
 #: users/templates/users/user_database_app_permission.html:42
-#: users/templates/users/user_group_list.html:17
-#: users/templates/users/user_list.html:20
-#: users/templates/users/user_remote_app_permission.html:42
 msgid "Action"
 msgstr "动作"
 
@@ -118,22 +98,17 @@ msgstr "动作"
 #: perms/models/base.py:50 templates/index.html:78
 #: terminal/backends/command/models.py:18
 #: terminal/backends/command/serializers.py:12 terminal/models/session.py:37
-#: tickets/models/comment.py:17 users/models/user.py:159
-#: users/models/user.py:707 users/serializers/group.py:20
+#: tickets/models/comment.py:17 users/models/user.py:164
+#: users/models/user.py:712 users/serializers/group.py:20
 #: users/templates/users/user_asset_permission.html:38
 #: users/templates/users/user_asset_permission.html:64
 #: users/templates/users/user_database_app_permission.html:37
 #: users/templates/users/user_database_app_permission.html:58
-#: users/templates/users/user_group_detail.html:73
-#: users/templates/users/user_group_list.html:15
-#: users/templates/users/user_list.html:135
-#: users/templates/users/user_remote_app_permission.html:37
-#: users/templates/users/user_remote_app_permission.html:58
 msgid "User"
 msgstr "用户"
 
 #: acls/models/login_asset_acl.py:17 authentication/models.py:72
-#: tickets/const.py:9 users/templates/users/user_detail.html:250
+#: tickets/const.py:9
 msgid "Login confirm"
 msgstr "登录复核"
 
@@ -152,18 +127,16 @@ msgstr "系统用户"
 #: terminal/backends/command/serializers.py:13 terminal/models/session.py:39
 #: users/templates/users/user_asset_permission.html:40
 #: users/templates/users/user_asset_permission.html:70
-#: users/templates/users/user_granted_remote_app.html:36
 #: xpack/plugins/change_auth_plan/models.py:282
 #: xpack/plugins/cloud/models.py:202
 msgid "Asset"
 msgstr "资产"
 
 #: acls/models/login_asset_acl.py:32 authentication/models.py:45
-#: users/templates/users/user_detail.html:258
 msgid "Reviewers"
 msgstr "审批人"
 
-#: acls/models/login_asset_acl.py:86 tickets/const.py:12
+#: acls/models/login_asset_acl.py:89 tickets/const.py:12
 msgid "Login asset confirm"
 msgstr "登录资产复核"
 
@@ -205,11 +178,8 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. "
 #: applications/serializers/attrs/application_type/vmware_client.py:26
 #: assets/models/base.py:251 assets/models/gathered_user.py:15
 #: audits/models.py:100 authentication/forms.py:15 authentication/forms.py:17
-#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:528
+#: ops/models/adhoc.py:148 users/forms/profile.py:31 users/models/user.py:533
 #: users/templates/users/_select_user_modal.html:14
-#: users/templates/users/user_detail.html:53
-#: users/templates/users/user_list.html:15
-#: users/templates/users/user_profile.html:47
 #: xpack/plugins/change_auth_plan/models.py:47
 #: xpack/plugins/change_auth_plan/models.py:278
 #: xpack/plugins/cloud/serializers.py:51
@@ -261,7 +231,6 @@ msgstr "所有复核人都不属于组织 `{}`"
 #: applications/const.py:9
 #: applications/serializers/attrs/application_category/db.py:14
 #: applications/serializers/attrs/application_type/mysql_workbench.py:26
-#: users/templates/users/user_granted_database_app.html:37
 msgid "Database"
 msgstr "数据库"
 
@@ -288,7 +257,6 @@ msgstr "类别"
 #: terminal/models/storage.py:26 terminal/models/storage.py:93
 #: tickets/models/ticket.py:38
 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:27
-#: users/templates/users/user_granted_database_app.html:35
 msgid "Type"
 msgstr "类型"
 
@@ -315,9 +283,7 @@ msgid "Cluster"
 msgstr "集群"
 
 #: applications/serializers/attrs/application_category/db.py:11
-#: ops/models/adhoc.py:146
-#: users/templates/users/user_granted_database_app.html:36
-#: xpack/plugins/cloud/serializers.py:49
+#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:49
 msgid "Host"
 msgstr "主机"
 
@@ -348,14 +314,12 @@ msgstr "目标URL"
 #: applications/serializers/attrs/application_type/mysql_workbench.py:34
 #: applications/serializers/attrs/application_type/vmware_client.py:30
 #: assets/models/base.py:252 assets/serializers/asset_user.py:71
-#: audits/signals_handler.py:46 authentication/forms.py:22
+#: audits/signals_handler.py:58 authentication/forms.py:22
 #: authentication/templates/authentication/login.html:155
 #: settings/serializers/settings.py:93 users/forms/profile.py:21
 #: users/templates/users/user_otp_check_password.html:13
 #: users/templates/users/user_password_update.html:43
 #: users/templates/users/user_password_verify.html:18
-#: users/templates/users/user_profile_update.html:41
-#: users/templates/users/user_pubkey_update.html:41
 #: users/templates/users/user_update.html:20
 #: xpack/plugins/change_auth_plan/models.py:68
 #: xpack/plugins/change_auth_plan/models.py:190
@@ -518,9 +482,8 @@ msgstr "标签管理"
 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:26
 #: assets/models/cmd_filter.py:60 assets/models/group.py:21
 #: common/db/models.py:70 common/mixins/models.py:49 orgs/models.py:24
-#: orgs/models.py:422 perms/models/base.py:55 users/models/user.py:571
-#: users/serializers/group.py:35 users/templates/users/user_detail.html:97
-#: xpack/plugins/change_auth_plan/models.py:81
+#: orgs/models.py:422 perms/models/base.py:55 users/models/user.py:576
+#: users/serializers/group.py:35 xpack/plugins/change_auth_plan/models.py:81
 #: xpack/plugins/cloud/models.py:104 xpack/plugins/gathered_user/models.py:30
 msgid "Created by"
 msgstr "创建者"
@@ -533,7 +496,6 @@ msgstr "创建者"
 #: assets/models/label.py:25 common/db/models.py:72 common/mixins/models.py:50
 #: ops/models/adhoc.py:38 ops/models/command.py:29 orgs/models.py:25
 #: orgs/models.py:420 perms/models/base.py:56 users/models/group.py:18
-#: users/templates/users/user_group_detail.html:58
 #: xpack/plugins/cloud/models.py:107
 msgid "Date created"
 msgstr "创建日期"
@@ -580,8 +542,7 @@ msgstr "带宽"
 msgid "Contact"
 msgstr "联系人"
 
-#: assets/models/cluster.py:22 users/models/user.py:549
-#: users/templates/users/user_detail.html:62
+#: assets/models/cluster.py:22 users/models/user.py:554
 msgid "Phone"
 msgstr "手机"
 
@@ -607,7 +568,7 @@ msgid "Default"
 msgstr "默认"
 
 #: assets/models/cluster.py:36 assets/models/label.py:14
-#: users/models/user.py:719
+#: users/models/user.py:724
 msgid "System"
 msgstr "系统"
 
@@ -734,8 +695,7 @@ msgstr "资产"
 msgid "Users"
 msgstr "用户管理"
 
-#: assets/models/user.py:121 users/templates/users/user_group_list.html:90
-#: users/templates/users/user_profile.html:124
+#: assets/models/user.py:121
 msgid "User groups"
 msgstr "用户组"
 
@@ -782,8 +742,6 @@ msgstr "用户组"
 #: users/templates/users/user_asset_permission.html:159
 #: users/templates/users/user_database_app_permission.html:40
 #: users/templates/users/user_database_app_permission.html:67
-#: users/templates/users/user_remote_app_permission.html:40
-#: users/templates/users/user_remote_app_permission.html:67
 msgid "System user"
 msgstr "系统用户"
 
@@ -847,14 +805,11 @@ msgid "Backend"
 msgstr "后端"
 
 #: assets/serializers/asset_user.py:75 users/forms/profile.py:160
-#: users/models/user.py:560 users/templates/users/user_password_update.html:48
-#: users/templates/users/user_profile.html:69
-#: users/templates/users/user_profile_update.html:46
-#: users/templates/users/user_pubkey_update.html:46
+#: users/models/user.py:565 users/templates/users/user_password_update.html:48
 msgid "Public key"
 msgstr "SSH公钥"
 
-#: assets/serializers/asset_user.py:79 users/models/user.py:557
+#: assets/serializers/asset_user.py:79 users/models/user.py:562
 msgid "Private key"
 msgstr "ssh私钥"
 
@@ -984,25 +939,25 @@ msgid ""
 "The task of self-checking is already running and cannot be started repeatedly"
 msgstr "自检程序已经在运行，不能重复启动"
 
-#: assets/tasks/push_system_user.py:192
+#: assets/tasks/push_system_user.py:193
 #: assets/tasks/system_user_connectivity.py:89
 msgid "System user is dynamic: {}"
 msgstr "系统用户是动态的: {}"
 
-#: assets/tasks/push_system_user.py:232
+#: assets/tasks/push_system_user.py:233
 msgid "Start push system user for platform: [{}]"
 msgstr "推送系统用户到平台: [{}]"
 
-#: assets/tasks/push_system_user.py:233
+#: assets/tasks/push_system_user.py:234
 #: assets/tasks/system_user_connectivity.py:81
 msgid "Hosts count: {}"
 msgstr "主机数量: {}"
 
-#: assets/tasks/push_system_user.py:272 assets/tasks/push_system_user.py:298
+#: assets/tasks/push_system_user.py:273 assets/tasks/push_system_user.py:299
 msgid "Push system users to assets: {}"
 msgstr "推送系统用户到入资产: {}"
 
-#: assets/tasks/push_system_user.py:284
+#: assets/tasks/push_system_user.py:285
 msgid "Push system users to asset: {}({}) => {}"
 msgstr "推送系统用户到入资产: {}({}) => {}"
 
@@ -1042,12 +997,6 @@ msgstr "没有匹配到资产，结束任务"
 #: authentication/templates/authentication/_access_key_modal.html:65
 #: users/templates/users/user_asset_permission.html:128
 #: users/templates/users/user_database_app_permission.html:111
-#: users/templates/users/user_detail.html:16
-#: users/templates/users/user_group_detail.html:27
-#: users/templates/users/user_group_list.html:53
-#: users/templates/users/user_list.html:94
-#: users/templates/users/user_list.html:98
-#: users/templates/users/user_remote_app_permission.html:111
 msgid "Delete"
 msgstr "删除"
 
@@ -1089,7 +1038,6 @@ msgid "Filename"
 msgstr "文件名"
 
 #: audits/models.py:42 audits/models.py:96
-#: users/templates/users/user_detail.html:487
 msgid "Success"
 msgstr "成功"
 
@@ -1114,15 +1062,6 @@ msgstr "创建"
 #: templates/_csv_update_modal.html:6
 #: users/templates/users/user_asset_permission.html:127
 #: users/templates/users/user_database_app_permission.html:110
-#: users/templates/users/user_detail.html:12
-#: users/templates/users/user_group_detail.html:23
-#: users/templates/users/user_group_list.html:51
-#: users/templates/users/user_list.html:84
-#: users/templates/users/user_list.html:87
-#: users/templates/users/user_profile.html:181
-#: users/templates/users/user_profile.html:191
-#: users/templates/users/user_profile.html:201
-#: users/templates/users/user_remote_app_permission.html:110
 msgid "Update"
 msgstr "更新"
 
@@ -1142,12 +1081,11 @@ msgstr "日期"
 msgid "Change by"
 msgstr "修改者"
 
-#: audits/models.py:90 users/templates/users/user_detail.html:84
+#: audits/models.py:90
 msgid "Disabled"
 msgstr "禁用"
 
 #: audits/models.py:91 settings/models.py:33
-#: users/templates/users/user_detail.html:82
 msgid "Enabled"
 msgstr "启用"
 
@@ -1180,9 +1118,8 @@ msgstr "用户代理"
 #: audits/models.py:105
 #: authentication/templates/authentication/_mfa_confirm_modal.html:14
 #: authentication/templates/authentication/login_otp.html:6
-#: users/forms/profile.py:64 users/models/user.py:552
-#: users/serializers/profile.py:99 users/templates/users/user_detail.html:77
-#: users/templates/users/user_profile.html:87
+#: users/forms/profile.py:64 users/models/user.py:557
+#: users/serializers/profile.py:99
 msgid "MFA"
 msgstr "多因子认证"
 
@@ -1250,11 +1187,11 @@ msgstr "运行用户（显示名称）"
 msgid "User for display"
 msgstr "用户（显示名称）"
 
-#: audits/signals_handler.py:45
+#: audits/signals_handler.py:57
 msgid "SSH Key"
 msgstr "SSH 密钥"
 
-#: audits/signals_handler.py:47
+#: audits/signals_handler.py:59
 msgid "SSO"
 msgstr ""
 
@@ -1465,18 +1402,13 @@ msgid "Show"
 msgstr "显示"
 
 #: authentication/templates/authentication/_access_key_modal.html:66
-#: users/models/user.py:445 users/serializers/profile.py:96
-#: users/templates/users/user_profile.html:94
-#: users/templates/users/user_profile.html:163
-#: users/templates/users/user_profile.html:166
+#: users/models/user.py:450 users/serializers/profile.py:96
 #: users/templates/users/user_verify_mfa.html:32
 msgid "Disable"
 msgstr "禁用"
 
 #: authentication/templates/authentication/_access_key_modal.html:67
-#: users/models/user.py:446 users/serializers/profile.py:97
-#: users/templates/users/user_profile.html:92
-#: users/templates/users/user_profile.html:170
+#: users/models/user.py:451 users/serializers/profile.py:97
 msgid "Enable"
 msgstr "启用"
 
@@ -1508,14 +1440,7 @@ msgid "Need MFA for view auth"
 msgstr "需要多因子认证来查看账号信息"
 
 #: authentication/templates/authentication/_mfa_confirm_modal.html:20
-#: templates/_modal.html:23 users/templates/users/user_detail.html:264
-#: users/templates/users/user_detail.html:417
-#: users/templates/users/user_detail.html:443
-#: users/templates/users/user_detail.html:466
-#: users/templates/users/user_detail.html:511
-#: users/templates/users/user_group_create_update.html:28
-#: users/templates/users/user_list.html:184
-#: users/templates/users/user_password_verify.html:20
+#: templates/_modal.html:23 users/templates/users/user_password_verify.html:20
 msgid "Confirm"
 msgstr "确认"
 
@@ -1826,7 +1751,7 @@ msgstr "再次执行"
 msgid "Become"
 msgstr "Become"
 
-#: ops/models/adhoc.py:150 users/templates/users/user_group_detail.html:54
+#: ops/models/adhoc.py:150
 msgid "Create by"
 msgstr "创建者"
 
@@ -1936,11 +1861,8 @@ msgstr "组织审计员"
 msgid "GLOBAL"
 msgstr "全局组织"
 
-#: orgs/models.py:419 users/models/user.py:540
+#: orgs/models.py:419 users/models/user.py:545
 #: users/templates/users/_select_user_modal.html:15
-#: users/templates/users/user_detail.html:73
-#: users/templates/users/user_list.html:16
-#: users/templates/users/user_profile.html:55
 msgid "Role"
 msgstr "角色"
 
@@ -1952,7 +1874,7 @@ msgstr "管理员正在修改授权，请稍等"
 msgid "The authorization cannot be revoked for the time being"
 msgstr "该授权暂时不能撤销"
 
-#: perms/models/application_permission.py:27 users/models/user.py:160
+#: perms/models/application_permission.py:27 users/models/user.py:165
 msgid "Application"
 msgstr "应用程序"
 
@@ -2011,15 +1933,11 @@ msgid "Favorite"
 msgstr "收藏夹"
 
 #: perms/models/base.py:51 templates/_nav.html:21 users/models/group.py:31
-#: users/models/user.py:536 users/templates/users/_select_user_modal.html:16
+#: users/models/user.py:541 users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_asset_permission.html:39
 #: users/templates/users/user_asset_permission.html:67
 #: users/templates/users/user_database_app_permission.html:38
 #: users/templates/users/user_database_app_permission.html:61
-#: users/templates/users/user_detail.html:209
-#: users/templates/users/user_list.html:17
-#: users/templates/users/user_remote_app_permission.html:38
-#: users/templates/users/user_remote_app_permission.html:61
 msgid "User group"
 msgstr "用户组"
 
@@ -2028,8 +1946,7 @@ msgstr "用户组"
 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:77
 #: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:43
 #: tickets/serializers/ticket/meta/ticket_type/apply_asset.py:81
-#: users/models/user.py:568 users/templates/users/user_detail.html:93
-#: users/templates/users/user_profile.html:120
+#: users/models/user.py:573
 msgid "Date expired"
 msgstr "失效日期"
 
@@ -2041,11 +1958,11 @@ msgstr "应用列表中包含与授权类型不同的应用。({})"
 
 #: perms/serializers/asset/permission.py:43
 #: perms/serializers/asset/permission.py:61 users/serializers/user.py:34
-#: users/serializers/user.py:69
+#: users/serializers/user.py:70
 msgid "Is expired"
 msgstr "是否过期"
 
-#: perms/serializers/asset/permission.py:62 users/serializers/user.py:68
+#: perms/serializers/asset/permission.py:62 users/serializers/user.py:69
 msgid "Is valid"
 msgstr "账户是否有效"
 
@@ -2079,7 +1996,6 @@ msgid "Imported {} users successfully"
 msgstr "导入 {} 个用户成功"
 
 #: settings/models.py:123 users/templates/users/reset_password.html:29
-#: users/templates/users/user_profile.html:20
 msgid "Setting"
 msgstr "设置"
 
@@ -2262,23 +2178,29 @@ msgstr "自动"
 msgid "Password auth"
 msgstr "密码认证"
 
-#: settings/serializers/settings.py:124
+#: settings/serializers/settings.py:125
 msgid "Public key auth"
 msgstr "密钥认证"
 
-#: settings/serializers/settings.py:125
+#: settings/serializers/settings.py:126
+msgid ""
+"Tips: If use other auth method, like AD/LDAP, you should disable this to "
+"avoid being able to log in after deleting"
+msgstr "提示：如果你使用其它认证方式，如 AD/LDAP，你应该禁用此项，以避免第三方系统删除后，还可以登录"
+
+#: settings/serializers/settings.py:129
 msgid "List sort by"
 msgstr "资产列表排序"
 
-#: settings/serializers/settings.py:126
+#: settings/serializers/settings.py:130
 msgid "List page size"
 msgstr "资产列表每页数量"
 
-#: settings/serializers/settings.py:128
+#: settings/serializers/settings.py:132
 msgid "Session keep duration"
 msgstr "会话日志保存时间"
 
-#: settings/serializers/settings.py:129
+#: settings/serializers/settings.py:133
 msgid ""
 "Units: days, Session, record, command will be delete if more than duration, "
 "only in database"
@@ -2286,64 +2208,64 @@ msgstr ""
 "单位：天。 会话、录像、命令记录超过该时长将会被删除(仅影响数据库存储, oss等不"
 "受影响)"
 
-#: settings/serializers/settings.py:131
+#: settings/serializers/settings.py:135
 msgid "Telnet login regex"
 msgstr "Telnet 成功正则表达式"
 
-#: settings/serializers/settings.py:136
+#: settings/serializers/settings.py:140
 msgid "Global MFA auth"
 msgstr "全局启用 MFA 认证"
 
-#: settings/serializers/settings.py:137
+#: settings/serializers/settings.py:141
 msgid "All user enable MFA"
 msgstr "强制所有用户启用多因子认证"
 
-#: settings/serializers/settings.py:140
+#: settings/serializers/settings.py:144
 msgid "Batch command execution"
 msgstr "批量命令执行"
 
-#: settings/serializers/settings.py:141
+#: settings/serializers/settings.py:145
 msgid "Allow user run batch command or not using ansible"
 msgstr "是否允许用户使用 ansible 执行批量命令"
 
-#: settings/serializers/settings.py:144
+#: settings/serializers/settings.py:148
 msgid "Enable terminal register"
 msgstr "终端注册"
 
-#: settings/serializers/settings.py:145
+#: settings/serializers/settings.py:149
 msgid ""
 "Allow terminal register, after all terminal setup, you should disable this "
 "for security"
 msgstr "是否允许终端注册，当所有终端启动后，为了安全应该关闭"
 
-#: settings/serializers/settings.py:149
+#: settings/serializers/settings.py:153
 msgid "Limit the number of login failures"
 msgstr "限制登录失败次数"
 
-#: settings/serializers/settings.py:153
+#: settings/serializers/settings.py:157
 msgid "Block logon interval"
 msgstr "禁止登录时间间隔"
 
-#: settings/serializers/settings.py:154
+#: settings/serializers/settings.py:158
 msgid ""
 "Tip: (unit/minute) if the user has failed to log in for a limited number of "
 "times, no login is allowed during this time interval."
 msgstr ""
 "提示：（单位：分）当用户登录失败次数达到限制后，那么在此时间间隔内禁止登录"
 
-#: settings/serializers/settings.py:158
+#: settings/serializers/settings.py:162
 msgid "Connection max idle time"
 msgstr "连接最大空闲时间"
 
-#: settings/serializers/settings.py:159
+#: settings/serializers/settings.py:163
 msgid "If idle time more than it, disconnect connection Unit: minute"
 msgstr "提示：如果超过该配置没有操作，连接会被断开 （单位：分）"
 
-#: settings/serializers/settings.py:163
+#: settings/serializers/settings.py:167
 msgid "User password expiration"
 msgstr "用户密码过期时间"
 
-#: settings/serializers/settings.py:164
+#: settings/serializers/settings.py:168
 msgid ""
 "Tip: (unit: day) If the user does not update the password during the time, "
 "the user password will expire failure;The password expiration reminder mail "
@@ -2353,35 +2275,35 @@ msgstr ""
 "提示：（单位：天）如果用户在此期间没有更新密码，用户密码将过期失效； 密码过期"
 "提醒邮件将在密码过期前5天内由系统（每天）自动发送给用户"
 
-#: settings/serializers/settings.py:168
+#: settings/serializers/settings.py:172
 msgid "Password minimum length"
 msgstr "密码最小长度"
 
-#: settings/serializers/settings.py:171
+#: settings/serializers/settings.py:175
 msgid "Must contain capital"
 msgstr "必须包含大写字符"
 
-#: settings/serializers/settings.py:173
+#: settings/serializers/settings.py:177
 msgid "Must contain lowercase"
 msgstr "必须包含小写字符"
 
-#: settings/serializers/settings.py:174
+#: settings/serializers/settings.py:178
 msgid "Must contain numeric"
 msgstr "必须包含数字"
 
-#: settings/serializers/settings.py:175
+#: settings/serializers/settings.py:179
 msgid "Must contain special"
 msgstr "必须包含特殊字符"
 
-#: settings/serializers/settings.py:176
+#: settings/serializers/settings.py:180
 msgid "Insecure command alert"
 msgstr "危险命令告警"
 
-#: settings/serializers/settings.py:178
+#: settings/serializers/settings.py:182
 msgid "Email recipient"
 msgstr "邮件收件人"
 
-#: settings/serializers/settings.py:179
+#: settings/serializers/settings.py:183
 msgid "Multiple user using , split"
 msgstr "多个用户，使用 , 分割"
 
@@ -2532,12 +2454,7 @@ msgstr "商业支持"
 
 #: templates/_header_bar.html:70 templates/_nav.html:30
 #: templates/_nav_user.html:37 users/forms/profile.py:43
-#: users/templates/users/_user.html:44
 #: users/templates/users/user_password_update.html:39
-#: users/templates/users/user_profile.html:17
-#: users/templates/users/user_profile_update.html:37
-#: users/templates/users/user_profile_update.html:61
-#: users/templates/users/user_pubkey_update.html:37
 msgid "Profile"
 msgstr "个人信息"
 
@@ -2659,8 +2576,6 @@ msgid "Applications"
 msgstr "应用管理"
 
 #: templates/_nav.html:64 templates/_nav.html:82 templates/_nav_user.html:16
-#: users/templates/users/user_remote_app_permission.html:39
-#: users/templates/users/user_remote_app_permission.html:64
 msgid "RemoteApp"
 msgstr "远程应用"
 
@@ -3028,7 +2943,6 @@ msgid "High"
 msgstr "较高"
 
 #: terminal/const.py:33 users/templates/users/reset_password.html:50
-#: users/templates/users/user_create.html:35
 #: users/templates/users/user_password_update.html:104
 #: users/templates/users/user_update.html:57
 msgid "Normal"
@@ -3655,9 +3569,7 @@ msgstr "确认密码"
 msgid "Password does not match"
 msgstr "密码不一致"
 
-#: users/forms/profile.py:101 users/models/user.py:532
-#: users/templates/users/user_detail.html:57
-#: users/templates/users/user_profile.html:59
+#: users/forms/profile.py:101 users/models/user.py:537
 msgid "Email"
 msgstr "邮件"
 
@@ -3690,49 +3602,47 @@ msgid "Public key should not be the same as your old one."
 msgstr "不能和原来的密钥相同"
 
 #: users/forms/profile.py:149 users/serializers/profile.py:71
-#: users/serializers/profile.py:144 users/serializers/profile.py:157
+#: users/serializers/profile.py:145 users/serializers/profile.py:158
 msgid "Not a valid ssh public key"
 msgstr "SSH密钥不合法"
 
-#: users/models/user.py:157
+#: users/models/user.py:162
 msgid "System administrator"
 msgstr "系统管理员"
 
-#: users/models/user.py:158
+#: users/models/user.py:163
 msgid "System auditor"
 msgstr "系统审计员"
 
-#: users/models/user.py:447 users/templates/users/user_profile.html:90
+#: users/models/user.py:452
 msgid "Force enable"
 msgstr "强制启用"
 
-#: users/models/user.py:512
+#: users/models/user.py:517
 msgid "Local"
 msgstr "数据库"
 
-#: users/models/user.py:543
+#: users/models/user.py:548
 msgid "Avatar"
 msgstr "头像"
 
-#: users/models/user.py:546 users/templates/users/user_detail.html:68
+#: users/models/user.py:551
 msgid "Wechat"
 msgstr "微信"
 
-#: users/models/user.py:576 users/templates/users/user_detail.html:89
-#: users/templates/users/user_list.html:18
-#: users/templates/users/user_profile.html:102
+#: users/models/user.py:581
 msgid "Source"
 msgstr "用户来源"
 
-#: users/models/user.py:580
+#: users/models/user.py:585
 msgid "Date password last updated"
 msgstr "最后更新密码日期"
 
-#: users/models/user.py:715
+#: users/models/user.py:720
 msgid "Administrator"
 msgstr "管理员"
 
-#: users/models/user.py:718
+#: users/models/user.py:723
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
@@ -3740,7 +3650,7 @@ msgstr "Administrator是初始的超级管理员"
 msgid "The old password is incorrect"
 msgstr "旧密码错误"
 
-#: users/serializers/profile.py:37 users/serializers/user.py:112
+#: users/serializers/profile.py:37 users/serializers/user.py:113
 msgid "Password does not match security rules"
 msgstr "密码不满足安全规则"
 
@@ -3748,7 +3658,7 @@ msgstr "密码不满足安全规则"
 msgid "The newly set password is inconsistent"
 msgstr "两次密码不一致"
 
-#: users/serializers/profile.py:115 users/serializers/user.py:67
+#: users/serializers/profile.py:116 users/serializers/user.py:68
 msgid "Is first login"
 msgstr "首次登录"
 
@@ -3789,35 +3699,35 @@ msgstr "是否可更新"
 msgid "Can delete"
 msgstr "是否可删除"
 
-#: users/serializers/user.py:38 users/serializers/user.py:74
+#: users/serializers/user.py:39 users/serializers/user.py:75
 msgid "Organization role name"
 msgstr "组织角色名称"
 
-#: users/serializers/user.py:70
+#: users/serializers/user.py:71
 msgid "Avatar url"
 msgstr "头像路径"
 
-#: users/serializers/user.py:72
+#: users/serializers/user.py:73
 msgid "Groups name"
 msgstr "用户组名"
 
-#: users/serializers/user.py:73
+#: users/serializers/user.py:74
 msgid "Source name"
 msgstr "用户来源名"
 
-#: users/serializers/user.py:75
+#: users/serializers/user.py:76
 msgid "Super role name"
 msgstr "超级角色名称"
 
-#: users/serializers/user.py:76
+#: users/serializers/user.py:77
 msgid "Total role name"
 msgstr "汇总角色名称"
 
-#: users/serializers/user.py:100
+#: users/serializers/user.py:101
 msgid "Role limit to {}"
 msgstr "角色只能为 {}"
 
-#: users/serializers/user.py:197
+#: users/serializers/user.py:198
 msgid "name not unique"
 msgstr "名称重复"
 
@@ -3825,9 +3735,8 @@ msgstr "名称重复"
 msgid "Security token validation"
 msgstr "安全令牌验证"
 
-#: users/templates/users/_base_otp.html:14 users/templates/users/_user.html:13
-#: users/templates/users/user_profile_update.html:55
-#: xpack/plugins/cloud/models.py:78 xpack/plugins/cloud/serializers.py:145
+#: users/templates/users/_base_otp.html:14 xpack/plugins/cloud/models.py:78
+#: xpack/plugins/cloud/serializers.py:145
 msgid "Account"
 msgstr "账户"
 
@@ -3847,36 +3756,6 @@ msgstr "选择用户"
 msgid "Asset num"
 msgstr "资产数量"
 
-#: users/templates/users/_user.html:21
-msgid "Auth"
-msgstr "认证"
-
-#: users/templates/users/_user.html:27
-msgid "Security and Role"
-msgstr "角色安全"
-
-#: users/templates/users/_user.html:51
-#: users/templates/users/user_bulk_update.html:23
-#: users/templates/users/user_detail.html:168
-#: users/templates/users/user_group_create_update.html:27
-#: users/templates/users/user_password_update.html:74
-#: users/templates/users/user_profile.html:209
-#: users/templates/users/user_profile_update.html:67
-#: users/templates/users/user_pubkey_update.html:74
-#: users/templates/users/user_pubkey_update.html:80
-msgid "Reset"
-msgstr "重置"
-
-#: users/templates/users/_user.html:52
-#: users/templates/users/forgot_password.html:32
-#: users/templates/users/user_bulk_update.html:24
-#: users/templates/users/user_list.html:40
-#: users/templates/users/user_password_update.html:75
-#: users/templates/users/user_profile_update.html:68
-#: users/templates/users/user_pubkey_update.html:81
-msgid "Submit"
-msgstr "提交"
-
 #: users/templates/users/_user_detail_nav_header.html:11
 msgid "User detail"
 msgstr "用户详情"
@@ -3886,8 +3765,6 @@ msgid "User permissions"
 msgstr "用户授权"
 
 #: users/templates/users/_user_detail_nav_header.html:23
-#: users/templates/users/user_group_detail.html:20
-#: users/templates/users/user_group_granted_asset.html:21
 msgid "Asset granted"
 msgstr "授权的资产"
 
@@ -3932,56 +3809,53 @@ msgstr "获取更多信息"
 msgid "Input your email, that will send a mail to your"
 msgstr "输入您的邮箱, 将会发一封重置邮件到您的邮箱中"
 
+#: users/templates/users/forgot_password.html:32
+#: users/templates/users/user_password_update.html:75
+msgid "Submit"
+msgstr "提交"
+
 #: users/templates/users/reset_password.html:5
-#: users/templates/users/reset_password.html:6
-#: users/templates/users/user_detail.html:402 users/utils.py:83
+#: users/templates/users/reset_password.html:6 users/utils.py:83
 msgid "Reset password"
 msgstr "重置密码"
 
 #: users/templates/users/reset_password.html:23
-#: users/templates/users/user_create.html:13
 #: users/templates/users/user_password_update.html:64
 #: users/templates/users/user_update.html:13
 msgid "Your password must satisfy"
 msgstr "您的密码必须满足："
 
 #: users/templates/users/reset_password.html:24
-#: users/templates/users/user_create.html:14
 #: users/templates/users/user_password_update.html:65
 #: users/templates/users/user_update.html:14
 msgid "Password strength"
 msgstr "密码强度："
 
 #: users/templates/users/reset_password.html:48
-#: users/templates/users/user_create.html:33
 #: users/templates/users/user_password_update.html:102
 #: users/templates/users/user_update.html:55
 msgid "Very weak"
 msgstr "很弱"
 
 #: users/templates/users/reset_password.html:49
-#: users/templates/users/user_create.html:34
 #: users/templates/users/user_password_update.html:103
 #: users/templates/users/user_update.html:56
 msgid "Weak"
 msgstr "弱"
 
 #: users/templates/users/reset_password.html:51
-#: users/templates/users/user_create.html:36
 #: users/templates/users/user_password_update.html:105
 #: users/templates/users/user_update.html:58
 msgid "Medium"
 msgstr "一般"
 
 #: users/templates/users/reset_password.html:52
-#: users/templates/users/user_create.html:37
 #: users/templates/users/user_password_update.html:106
 #: users/templates/users/user_update.html:59
 msgid "Strong"
 msgstr "强"
 
 #: users/templates/users/reset_password.html:53
-#: users/templates/users/user_create.html:38
 #: users/templates/users/user_password_update.html:107
 #: users/templates/users/user_update.html:60
 msgid "Very strong"
@@ -3990,8 +3864,6 @@ msgstr "很强"
 #: users/templates/users/user_asset_permission.html:43
 #: users/templates/users/user_asset_permission.html:155
 #: users/templates/users/user_database_app_permission.html:41
-#: users/templates/users/user_list.html:19
-#: users/templates/users/user_remote_app_permission.html:41
 #: xpack/plugins/cloud/models.py:34
 msgid "Validity"
 msgstr "有效"
@@ -4008,229 +3880,6 @@ msgstr "包含"
 msgid "Exclude"
 msgstr "不包含"
 
-#: users/templates/users/user_bulk_update.html:8
-msgid "Select properties that need to be modified"
-msgstr "选择需要修改属性"
-
-#: users/templates/users/user_bulk_update.html:10
-msgid "Select all"
-msgstr "全选"
-
-#: users/templates/users/user_create.html:4
-#: users/templates/users/user_list.html:7
-msgid "Create user"
-msgstr "创建用户"
-
-#: users/templates/users/user_detail.html:80
-msgid "Force enabled"
-msgstr "强制启用"
-
-#: users/templates/users/user_detail.html:101
-#: users/templates/users/user_profile.html:106
-msgid "Date joined"
-msgstr "创建日期"
-
-#: users/templates/users/user_detail.html:105
-#: users/templates/users/user_profile.html:110
-msgid "Last login"
-msgstr "最后登录"
-
-#: users/templates/users/user_detail.html:110
-#: users/templates/users/user_profile.html:115
-msgid "Last password updated"
-msgstr "最后更新密码"
-
-#: users/templates/users/user_detail.html:126
-#: users/templates/users/user_profile.html:150
-msgid "Quick modify"
-msgstr "快速修改"
-
-#: users/templates/users/user_detail.html:148
-msgid "Force enabled MFA"
-msgstr "强制启用多因子认证"
-
-#: users/templates/users/user_detail.html:165
-msgid "Reset MFA"
-msgstr "重置多因子认证"
-
-#: users/templates/users/user_detail.html:174
-msgid "Send reset password mail"
-msgstr "发送重置密码邮件"
-
-#: users/templates/users/user_detail.html:177
-#: users/templates/users/user_detail.html:187
-msgid "Send"
-msgstr "发送"
-
-#: users/templates/users/user_detail.html:184
-msgid "Send reset ssh key mail"
-msgstr "发送重置密钥邮件"
-
-#: users/templates/users/user_detail.html:193
-#: users/templates/users/user_detail.html:490
-msgid "Unblock user"
-msgstr "解除登录限制"
-
-#: users/templates/users/user_detail.html:196
-msgid "Unblock"
-msgstr "解除"
-
-#: users/templates/users/user_detail.html:217
-msgid "Join user groups"
-msgstr "添加到用户组"
-
-#: users/templates/users/user_detail.html:226
-msgid "Join"
-msgstr "加入"
-
-#: users/templates/users/user_detail.html:356
-#: users/templates/users/user_detail.html:383
-msgid "Update successfully!"
-msgstr "更新成功"
-
-#: users/templates/users/user_detail.html:365
-msgid "Goto profile page enable MFA"
-msgstr "请去个人信息页面启用自己的多因子认证"
-
-#: users/templates/users/user_detail.html:401
-msgid "An e-mail has been sent to the user`s mailbox."
-msgstr "已发送邮件到用户邮箱"
-
-#: users/templates/users/user_detail.html:411
-#: users/templates/users/user_detail.html:437
-#: users/templates/users/user_detail.html:505
-#: users/templates/users/user_list.html:178
-msgid "Are you sure?"
-msgstr "你确认吗?"
-
-#: users/templates/users/user_detail.html:412
-msgid "This will reset the user password and send a reset mail"
-msgstr "将失效用户当前密码，并发送重设密码邮件到用户邮箱"
-
-#: users/templates/users/user_detail.html:415
-#: users/templates/users/user_detail.html:441
-#: users/templates/users/user_detail.html:509
-#: users/templates/users/user_list.html:182
-msgid "Cancel"
-msgstr "取消"
-
-#: users/templates/users/user_detail.html:427
-msgid ""
-"The reset-ssh-public-key E-mail has been sent successfully. Please inform "
-"the user to update his new ssh public key."
-msgstr "重设密钥邮件将会发送到用户邮箱"
-
-#: users/templates/users/user_detail.html:428
-msgid "Reset SSH public key"
-msgstr "重置SSH密钥"
-
-#: users/templates/users/user_detail.html:438
-msgid "This will reset the user public key and send a reset mail"
-msgstr "将会失效用户当前密钥，并发送重置邮件到用户邮箱"
-
-#: users/templates/users/user_detail.html:456
-msgid "Successfully updated the SSH public key."
-msgstr "更新SSH密钥成功"
-
-#: users/templates/users/user_detail.html:457
-#: users/templates/users/user_detail.html:461
-msgid "User SSH public key update"
-msgstr "SSH密钥"
-
-#: users/templates/users/user_detail.html:506
-msgid "After unlocking the user, the user can log in normally."
-msgstr "解除用户登录限制后，此用户即可正常登录"
-
-#: users/templates/users/user_detail.html:520
-msgid "Reset user MFA success"
-msgstr "重置用户多因子认证成功"
-
-#: users/templates/users/user_granted_remote_app.html:35
-msgid "App type"
-msgstr "应用类型"
-
-#: users/templates/users/user_group_detail.html:17
-#: users/templates/users/user_group_granted_asset.html:18
-msgid "User group detail"
-msgstr "用户组详情"
-
-#: users/templates/users/user_group_detail.html:81
-msgid "Add user"
-msgstr "添加用户"
-
-#: users/templates/users/user_group_detail.html:87
-msgid "Add"
-msgstr "添加"
-
-#: users/templates/users/user_group_list.html:7
-msgid "Create user group"
-msgstr "创建用户组"
-
-#: users/templates/users/user_list.html:30
-msgid "Delete selected"
-msgstr "批量删除"
-
-#: users/templates/users/user_list.html:32
-msgid "Remove selected"
-msgstr "批量移除"
-
-#: users/templates/users/user_list.html:34
-msgid "Update selected"
-msgstr "批量更新"
-
-#: users/templates/users/user_list.html:35
-msgid "Deactive selected"
-msgstr "禁用所选"
-
-#: users/templates/users/user_list.html:36
-msgid "Active selected"
-msgstr "激活所选"
-
-#: users/templates/users/user_list.html:106
-#: users/templates/users/user_list.html:110
-msgid "Remove"
-msgstr "移除"
-
-#: users/templates/users/user_list.html:179
-msgid "This will delete the selected users !!!"
-msgstr "删除选中用户 !!!"
-
-#: users/templates/users/user_list.html:190
-msgid "User Deleting failed."
-msgstr "用户删除失败"
-
-#: users/templates/users/user_list.html:191
-msgid "User Delete"
-msgstr "删除"
-
-#: users/templates/users/user_list.html:213
-msgid "This will remove the selected users !!"
-msgstr "移除选中用户 !!!"
-
-#: users/templates/users/user_list.html:215
-msgid "User Removing failed."
-msgstr "用户移除失败"
-
-#: users/templates/users/user_list.html:216
-msgid "User Remove"
-msgstr "移除"
-
-#: users/templates/users/user_list.html:265
-msgid "Are you sure about removing it?"
-msgstr "您确定移除吗?"
-
-#: users/templates/users/user_list.html:266
-msgid "Remove the success"
-msgstr "移除成功"
-
-#: users/templates/users/user_list.html:271
-msgid "User is expired"
-msgstr "用户已失效"
-
-#: users/templates/users/user_list.html:274
-msgid "User is inactive"
-msgstr "用户已禁用"
-
 #: users/templates/users/user_otp_check_password.html:6
 #: users/templates/users/user_verify_mfa.html:6
 msgid "Authenticate"
@@ -4275,57 +3924,15 @@ msgid ""
 "installed, go to the next step directly)."
 msgstr "安装完成后点击下一步进入绑定页面（如已安装，直接进入下一步）"
 
+#: users/templates/users/user_password_update.html:74
+msgid "Reset"
+msgstr "重置"
+
 #: users/templates/users/user_password_verify.html:8
 #: users/templates/users/user_password_verify.html:9
 msgid "Verify password"
 msgstr "校验密码"
 
-#: users/templates/users/user_profile.html:97
-msgid "Administrator Settings force MFA login"
-msgstr "管理员设置强制使用多因子认证"
-
-#: users/templates/users/user_profile.html:156
-msgid "Set MFA"
-msgstr "设置多因子认证"
-
-#: users/templates/users/user_profile.html:178
-msgid "Update MFA"
-msgstr "更改多因子认证"
-
-#: users/templates/users/user_profile.html:188
-msgid "Update password"
-msgstr "更改密码"
-
-#: users/templates/users/user_profile.html:198
-msgid "Update SSH public key"
-msgstr "更改SSH密钥"
-
-#: users/templates/users/user_profile.html:206
-msgid "Reset public key and download"
-msgstr "重置并下载SSH密钥"
-
-#: users/templates/users/user_pubkey_update.html:55
-msgid "Old public key"
-msgstr "原来SSH密钥"
-
-#: users/templates/users/user_pubkey_update.html:63
-msgid "Fingerprint"
-msgstr "指纹"
-
-#: users/templates/users/user_pubkey_update.html:69
-msgid "Update public key"
-msgstr "更新密钥"
-
-#: users/templates/users/user_pubkey_update.html:72
-msgid "Or reset by server"
-msgstr "或者重置并下载密钥"
-
-#: users/templates/users/user_pubkey_update.html:98
-msgid ""
-"The new public key has been set successfully, Please download the "
-"corresponding private key."
-msgstr "新的公钥已设置成功，请下载对应的私钥"
-
 #: users/templates/users/user_update.html:4
 msgid "Update user"
 msgstr "更新用户"
@@ -5182,6 +4789,202 @@ msgstr "旗舰版"
 msgid "Community edition"
 msgstr "社区版"
 
+#~ msgid "Auth"
+#~ msgstr "认证"
+
+#~ msgid "Security and Role"
+#~ msgstr "角色安全"
+
+#~ msgid "Select properties that need to be modified"
+#~ msgstr "选择需要修改属性"
+
+#~ msgid "Select all"
+#~ msgstr "全选"
+
+#~ msgid "Create user"
+#~ msgstr "创建用户"
+
+#~ msgid "Force enabled"
+#~ msgstr "强制启用"
+
+#~ msgid "Date joined"
+#~ msgstr "创建日期"
+
+#~ msgid "Last login"
+#~ msgstr "最后登录"
+
+#~ msgid "Last password updated"
+#~ msgstr "最后更新密码"
+
+#~ msgid "Quick modify"
+#~ msgstr "快速修改"
+
+#~ msgid "Force enabled MFA"
+#~ msgstr "强制启用多因子认证"
+
+#~ msgid "Reset MFA"
+#~ msgstr "重置多因子认证"
+
+#~ msgid "Send reset password mail"
+#~ msgstr "发送重置密码邮件"
+
+#~ msgid "Send"
+#~ msgstr "发送"
+
+#~ msgid "Send reset ssh key mail"
+#~ msgstr "发送重置密钥邮件"
+
+#~ msgid "Unblock user"
+#~ msgstr "解除登录限制"
+
+#~ msgid "Unblock"
+#~ msgstr "解除"
+
+#~ msgid "Join user groups"
+#~ msgstr "添加到用户组"
+
+#~ msgid "Join"
+#~ msgstr "加入"
+
+#~ msgid "Update successfully!"
+#~ msgstr "更新成功"
+
+#~ msgid "Goto profile page enable MFA"
+#~ msgstr "请去个人信息页面启用自己的多因子认证"
+
+#~ msgid "An e-mail has been sent to the user`s mailbox."
+#~ msgstr "已发送邮件到用户邮箱"
+
+#~ msgid "Are you sure?"
+#~ msgstr "你确认吗?"
+
+#~ msgid "This will reset the user password and send a reset mail"
+#~ msgstr "将失效用户当前密码，并发送重设密码邮件到用户邮箱"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid ""
+#~ "The reset-ssh-public-key E-mail has been sent successfully. Please inform "
+#~ "the user to update his new ssh public key."
+#~ msgstr "重设密钥邮件将会发送到用户邮箱"
+
+#~ msgid "Reset SSH public key"
+#~ msgstr "重置SSH密钥"
+
+#~ msgid "This will reset the user public key and send a reset mail"
+#~ msgstr "将会失效用户当前密钥，并发送重置邮件到用户邮箱"
+
+#~ msgid "Successfully updated the SSH public key."
+#~ msgstr "更新SSH密钥成功"
+
+#~ msgid "User SSH public key update"
+#~ msgstr "SSH密钥"
+
+#~ msgid "After unlocking the user, the user can log in normally."
+#~ msgstr "解除用户登录限制后，此用户即可正常登录"
+
+#~ msgid "Reset user MFA success"
+#~ msgstr "重置用户多因子认证成功"
+
+#~ msgid "App type"
+#~ msgstr "应用类型"
+
+#~ msgid "User group detail"
+#~ msgstr "用户组详情"
+
+#~ msgid "Add user"
+#~ msgstr "添加用户"
+
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Create user group"
+#~ msgstr "创建用户组"
+
+#~ msgid "Delete selected"
+#~ msgstr "批量删除"
+
+#~ msgid "Remove selected"
+#~ msgstr "批量移除"
+
+#~ msgid "Update selected"
+#~ msgstr "批量更新"
+
+#~ msgid "Deactive selected"
+#~ msgstr "禁用所选"
+
+#~ msgid "Active selected"
+#~ msgstr "激活所选"
+
+#~ msgid "Remove"
+#~ msgstr "移除"
+
+#~ msgid "This will delete the selected users !!!"
+#~ msgstr "删除选中用户 !!!"
+
+#~ msgid "User Deleting failed."
+#~ msgstr "用户删除失败"
+
+#~ msgid "User Delete"
+#~ msgstr "删除"
+
+#~ msgid "This will remove the selected users !!"
+#~ msgstr "移除选中用户 !!!"
+
+#~ msgid "User Removing failed."
+#~ msgstr "用户移除失败"
+
+#~ msgid "User Remove"
+#~ msgstr "移除"
+
+#~ msgid "Are you sure about removing it?"
+#~ msgstr "您确定移除吗?"
+
+#~ msgid "Remove the success"
+#~ msgstr "移除成功"
+
+#~ msgid "User is expired"
+#~ msgstr "用户已失效"
+
+#~ msgid "User is inactive"
+#~ msgstr "用户已禁用"
+
+#~ msgid "Administrator Settings force MFA login"
+#~ msgstr "管理员设置强制使用多因子认证"
+
+#~ msgid "Set MFA"
+#~ msgstr "设置多因子认证"
+
+#~ msgid "Update MFA"
+#~ msgstr "更改多因子认证"
+
+#~ msgid "Update password"
+#~ msgstr "更改密码"
+
+#~ msgid "Update SSH public key"
+#~ msgstr "更改SSH密钥"
+
+#~ msgid "Reset public key and download"
+#~ msgstr "重置并下载SSH密钥"
+
+#~ msgid "Old public key"
+#~ msgstr "原来SSH密钥"
+
+#~ msgid "Fingerprint"
+#~ msgstr "指纹"
+
+#~ msgid "Update public key"
+#~ msgstr "更新密钥"
+
+#~ msgid "Or reset by server"
+#~ msgstr "或者重置并下载密钥"
+
+#~ msgid ""
+#~ "The new public key has been set successfully, Please download the "
+#~ "corresponding private key."
+#~ msgstr "新的公钥已设置成功，请下载对应的私钥"
+
 #~ msgid "(Domain name support)"
 #~ msgstr "(支持域名)"
 
diff --git a/apps/settings/serializers/settings.py b/apps/settings/serializers/settings.py
index c6a3c32ac..95757eb8b 100644
--- a/apps/settings/serializers/settings.py
+++ b/apps/settings/serializers/settings.py
@@ -121,7 +121,11 @@ class TerminalSettingSerializer(serializers.Serializer):
         ('50', '50'),
     )
     TERMINAL_PASSWORD_AUTH = serializers.BooleanField(required=False, label=_('Password auth'))
-    TERMINAL_PUBLIC_KEY_AUTH = serializers.BooleanField(required=False, label=_('Public key auth'))
+    TERMINAL_PUBLIC_KEY_AUTH = serializers.BooleanField(
+        required=False, label=_('Public key auth'),
+        help_text=_('Tips: If use other auth method, like AD/LDAP, you should disable this to '
+                    'avoid being able to log in after deleting')
+    )
     TERMINAL_ASSET_LIST_SORT_BY = serializers.ChoiceField(SORT_BY_CHOICES, required=False, label=_('List sort by'))
     TERMINAL_ASSET_LIST_PAGE_SIZE = serializers.ChoiceField(PAGE_SIZE_CHOICES, required=False, label=_('List page size'))
     TERMINAL_SESSION_KEEP_DURATION = serializers.IntegerField(
diff --git a/apps/users/models/user.py b/apps/users/models/user.py
index b10c07223..1f8b2418a 100644
--- a/apps/users/models/user.py
+++ b/apps/users/models/user.py
@@ -66,13 +66,9 @@ class AuthMixin:
     def can_update_ssh_key(self):
         return self.can_use_ssh_key_login()
 
-    def can_use_ssh_key_login(self):
-        if not settings.TERMINAL_PUBLIC_KEY_AUTH:
-            return False
-        if self.is_local or settings.TERMINAL_ONLY_SOURCE_LOCAL_CAN_PUBLIC_KEY_AUTH:
-            return True
-        else:
-            return False
+    @staticmethod
+    def can_use_ssh_key_login():
+        return settings.TERMINAL_PUBLIC_KEY_AUTH
 
     def is_public_key_valid(self):
         """
diff --git a/apps/users/templates/users/_user.html b/apps/users/templates/users/_user.html
deleted file mode 100644
index dbcf7f804..000000000
--- a/apps/users/templates/users/_user.html
+++ /dev/null
@@ -1,88 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load i18n %}
-{% load static %}
-{% load bootstrap3 %}
-{% block form %}
-    {% if form.non_field_errors %}
-         <div class="alert alert-danger">
-            {{ form.non_field_errors }}
-         </div>
-    {% endif %}
-    <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
-        {% csrf_token %}
-        <h3>{% trans 'Account' %}</h3>
-        {% bootstrap_field form.name layout="horizontal" %}
-        {% bootstrap_field form.username layout="horizontal" %}
-        {% bootstrap_field form.email layout="horizontal" %}
-        {% bootstrap_field form.groups layout="horizontal" %}
-
-        <div class="hr-line-dashed"></div>
-
-        <h3>{% trans 'Auth' %}</h3>
-        {% block password %}{% endblock %}
-        {% bootstrap_field form.mfa_level layout="horizontal" %}
-        {% bootstrap_field form.source layout="horizontal" %}
-
-        <div class="hr-line-dashed"></div>
-        <h3>{% trans 'Security and Role' %}</h3>
-        {% bootstrap_field form.role layout="horizontal" %}
-        <div class="form-group {% if form.date_expired.errors %} has-error {% endif %}" id="date_5">
-            <label for="{{ form.date_expired.id_for_label }}" class="col-sm-2 control-label">{{ form.date_expired.label }}</label>
-            <div class="col-sm-9">
-                <div class="input-group date">
-                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                    {% if form.errors %}
-                    <input id="{{ form.date_expired.id_for_label }}" name="{{ form.date_expired.html_name }}" type="text" class="form-control"  value="{{ form.date_expired.value }}">
-                    {% else %}
-                    <input id="{{ form.date_expired.id_for_label }}" name="{{ form.date_expired.html_name }}" type="text" class="form-control"  value="{{ form.date_expired.value|date:'Y-m-d H:i' }}">
-                    {% endif %}
-                </div>
-                <span class="help-block ">{{ form.date_expired.errors }}</span>
-            </div>
-         </div>
-        <div class="hr-line-dashed"></div>
-        <h3>{% trans 'Profile' %}</h3>
-        {% bootstrap_field form.phone layout="horizontal" %}
-        {% bootstrap_field form.wechat layout="horizontal" %}
-        {% bootstrap_field form.comment layout="horizontal" %}
-        <div class="hr-line-dashed"></div>
-        <div class="form-group">
-            <div class="col-sm-4 col-sm-offset-2">
-                <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-                <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-            </div>
-        </div>
-    </form>
-
-{% endblock %}
-{% block custom_foot_js %}
-    <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.js' %}"></script>
-    <script src="{% static 'js/plugins/datepicker/bootstrap-datepicker.zh-CN.min.js' %}"></script>
-    <script type="text/javascript" src='{% static "js/plugins/daterangepicker/moment.min.js" %}'></script>
-    <script type="text/javascript" src='{% static "js/plugins/daterangepicker/daterangepicker.min.js" %}'></script>
-    <link rel="stylesheet" type="text/css" href={% static "css/plugins/daterangepicker/daterangepicker.css" %} />
-
-    <script>
-        var role_id = '#' + '{{ form.role.id_for_label }}';
-        var groups_id = '#' + '{{ form.groups.id_for_label }}';
-        function fieldDisplay(){
-            var role = $(role_id).val();
-            if (role === 'Auditor'){
-                $(groups_id).closest('.form-group').addClass('hidden');
-            }
-            else {
-                $(groups_id).closest('.form-group').removeClass('hidden');
-            }}
-
-        $(document).ready(function () {
-            $('.select2').select2();
-            initDateRangePicker('#id_date_expired');
-            var mfa_radio = $('#id_mfa_level');
-            mfa_radio.addClass("form-inline");
-            mfa_radio.children().css("margin-right","15px");
-            fieldDisplay()
-        }).on('change', role_id, function(){
-            fieldDisplay();
-        })
-    </script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_bulk_update.html b/apps/users/templates/users/user_bulk_update.html
deleted file mode 100644
index 28b0e8cb7..000000000
--- a/apps/users/templates/users/user_bulk_update.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{% extends '_base_create_update.html' %}
-{% load static %}
-{% load bootstrap3 %}
-{% load i18n %}
-
-{% block form %}
-<div class="ydxbd" id="formlists" style="display: block;">
-    <p id="tags_p" class="mgl-5 c02">{% trans 'Select properties that need to be modified' %}</p>
-    <div class="tagBtnList">
-        <a class="label label-primary" id="change_all" value="1">{% trans 'Select all' %}</a>
-        {% for field in form %}
-            {% if field.name != 'users' %}
-             <a data-id="{{ field.id_for_label }}" class="label label-default label-primary field-tag" value="1">{{ field.label }}</a>
-            {% endif %}
-        {% endfor %}
-    </div>
-</div>
-<form method="post" class="form-horizontal" id="add_form">
-    {% csrf_token %}
-    {% bootstrap_form form layout="horizontal" %}
-    <div class="form-group abc">
-        <div class="col-sm-4 col-sm-offset-2">
-            <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-            <button class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-        </div>
-    </div>
-</form>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-    $(document).ready(function () {
-        $('.select2').select2();
-        usersSelect2Init('.users-select2')
-    }).on('click', '.field-tag', function() {
-        changeField(this);
-    }).on('click', '#change_all', function () {
-        var tag_fields = $('.field-tag');
-        var $this = $(this);
-        var active = '1';
-        if ($this.attr('value') == '0'){
-            active = '0';
-            $this.attr('value', '1').addClass('label-primary')
-        } else {
-            active = '1';
-            $this.attr('value', '0').removeClass('label-primary')
-        }
-        $.each(tag_fields, function (k, v) {
-            changeField(v, active)
-        })
-    });
-
-    function changeField(obj, active) {
-        var $this = $(obj);
-        var field_id = $this.data('id');
-        if (!active) {
-            active = $this.attr('value');
-        }
-        if (active == '0') {
-            $this.attr('value', '1').addClass('label-primary');
-            var form_groups = $('#add_form .form-group');
-            form_groups.filter(':has(#'  + field_id + ')').show().find('select,input').prop('disabled', false)
-        } else {
-            $this.attr('value', '0').removeClass('label-primary');
-            var form_groups = $('#add_form .form-group');
-            form_groups.filter(':has(#'  + field_id + ')').hide().find('select,input').prop('disabled', true)
-        }
-    }
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_create.html b/apps/users/templates/users/user_create.html
deleted file mode 100644
index 5e15b5469..000000000
--- a/apps/users/templates/users/user_create.html
+++ /dev/null
@@ -1,100 +0,0 @@
-{% extends 'users/_user.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% block user_template_title %}{% trans "Create user" %}{% endblock %}
-{% block password %}
-    {% bootstrap_field form.password_strategy layout="horizontal" %}
-    {% bootstrap_field form.password layout="horizontal" %}
-    {#  密码popover  #}
-    <div id="container">
-        <div class="popover fade bottom in" role="tooltip" id="popover777" style=" display: none; width:260px;">
-            <div class="arrow" style="left: 50%;"></div>
-            <h3 class="popover-title" style="display: none;"></h3>
-            <h4>{% trans 'Your password must satisfy' %}</h4><div id="id_password_rules" style="color: #908a8a; margin-left:20px; font-size:15px;"></div>
-            <h4 style="margin-top: 10px;">{% trans 'Password strength' %}</h4><div id="id_progress"></div>
-            <div class="popover-content"></div>
-        </div>
-    </div>
-<script>
-function passwordCheck() {
-    if ($('#id_password').length != 1) {
-        return
-    }
-    var el = $('#id_password_rules'),
-        idPassword = $('#id_password'),
-        idPopover = $('#popover777'),
-        container = $('#container'),
-        progress = $('#id_progress'),
-        password_check_rules = {{ password_check_rules|safe }},
-        minLength = 6,
-        top = idPassword.offset().top - $('.navbar').outerHeight(true) - $('.page-heading').outerHeight(true) -77 + 34,
-        left = 377,
-        i18n_fallback = {
-            "veryWeak": "{% trans 'Very weak' %}",
-            "weak": "{% trans 'Weak' %}",
-            "normal": "{% trans 'Normal' %}",
-            "medium": "{% trans 'Medium' %}",
-            "strong": "{% trans 'Strong' %}",
-            "veryStrong": "{% trans 'Very strong' %}"
-        };
-
-    $.each(password_check_rules, function (idx, rules) {
-        if(rules.key === 'id_security_password_min_length'){
-            minLength = rules.value
-        }
-    });
-
-    // 初始化popover
-    initPopover(container, progress, idPassword, el, password_check_rules, i18n_fallback);
-
-    // 监听事件
-    idPassword.on('focus', function () {
-        idPopover.css('top', top);
-        idPopover.css('left', left);
-        idPopover.css('display', 'block');
-    });
-    idPassword.on('blur', function () {
-        idPopover.css('display', 'none');
-    });
-    idPassword.on('keyup', function(){
-        var password = idPassword.val();
-        checkPasswordRules(password, minLength);
-    });
-}
-var password_strategy_radio_input = 'input[type=radio][name=password_strategy]';
-function passwordStrategyFieldsDisplay(){
-    var val = $('input:radio[name="password_strategy"]:checked').val();
-    if(val === '0'){
-        $('#id_password').parents('.form-group').addClass('hidden')
-    }else {
-        $('#id_password').parents('.form-group').removeClass('hidden')
-    }
-}
-$(document).ready(function () {
-    passwordCheck();
-    passwordStrategyFieldsDisplay()
-
-}).on('change', password_strategy_radio_input, function(){
-        passwordStrategyFieldsDisplay()
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url 'api-users:user-list' %}';
-    var redirect_to = '{% url "users:user-list" %}';
-    var method = "POST";
-    var form = $("form");
-    var data = form.serializeObject();
-    objectAttrsIsList(data, ['groups']);
-    objectAttrsIsDatetime(data,['date_expired']);
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-     };
-    formSubmit(props);
-})
-</script>
-{% endblock %}
-
diff --git a/apps/users/templates/users/user_detail.html b/apps/users/templates/users/user_detail.html
deleted file mode 100644
index 0b624b78a..000000000
--- a/apps/users/templates/users/user_detail.html
+++ /dev/null
@@ -1,550 +0,0 @@
-{% extends 'users/_base_user_detail.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
-    <script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
-{% endblock %}
-
-{% block content_nav_delete_update %}
-    <li class="pull-right">
-        <a class="btn btn-outline {% if can_update %} btn-default {% else %} disabled {% endif %}" href="{% url 'users:user-update' pk=object.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-    </li>
-    <li class="pull-right">
-        <a class="btn btn-outline {% if can_delete %} btn-danger btn-delete-user {% else %} disabled {% endif %}">
-            <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-        </a>
-    </li>
-{% endblock %}
-
-{% block content_table %}
-    <div class="col-sm-8" style="padding-left: 0">
-        <div class="ibox float-e-margins">
-            <div class="ibox-title">
-                <span class="label"><b>{{ object.name }}</b></span>
-                <div class="ibox-tools">
-                    <a class="collapse-link">
-                        <i class="fa fa-chevron-up"></i>
-                    </a>
-                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                        <i class="fa fa-wrench"></i>
-                    </a>
-                    <ul class="dropdown-menu dropdown-user">
-                    </ul>
-                    <a class="close-link">
-                        <i class="fa fa-times"></i>
-                    </a>
-                </div>
-            </div>
-            <div class="ibox-content">
-                <table class="table">
-                    <tbody>
-                    <tr class="no-borders-tr">
-                        <td colspan="2">
-                            <img src="{{ object.avatar_url }}" class="img-circle" width="64" height="64">
-                        </td>
-                    </tr>
-                    <tr>
-                        <td width="20%">{% trans 'Name' %}:</td>
-                        <td><b>{{ object.name }}</b></td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Username' %}:</td>
-                        <td><b>{{ object.username }}</b></td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Email' %}:</td>
-                        <td><b>{{ object.email }}</b></td>
-                    </tr>
-                    {% if user.phone %}
-                        <tr>
-                            <td>{% trans 'Phone' %}:</td>
-                            <td><b>{{ object.phone }}</b></td>
-                        </tr>
-                    {% endif %}
-                    {% if object.wechat %}
-                        <tr>
-                            <td>{% trans 'Wechat' %}:</td>
-                            <td><b>{{ object.wechat }}</b></td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <td>{% trans 'Role' %}:</td>
-                        <td><b>{{ object.org_role_display }}</b></td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'MFA' %}:</td>
-                        <td><b>
-                            {% if object.mfa_force_enabled %}
-                                {% trans 'Force enabled' %}
-                            {% elif  object.mfa_enabled%}
-                                {% trans 'Enabled' %}
-                            {% else %}
-                                {% trans 'Disabled' %}
-                            {% endif %}
-                        </b></td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Source' %}:</td>
-                        <td><b>{{ object.get_source_display }}</b></td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Date expired' %}:</td>
-                        <td><b>{{ object.date_expired|date:"Y-m-j H:i:s" }}</b></td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Created by' %}:</td>
-                        <td><b>{{ object.created_by }}</b></td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Date joined' %}:</td>
-                        <td><b>{{ object.date_joined|date:"Y-m-j H:i:s" }}</b></td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Last login' %}:</td>
-                        <td><b>{{ object.last_login|date:"Y-m-j H:i:s" }}</b></td>
-                    </tr>
-                    {% if object.can_update_password %}
-                        <tr>
-                            <td>{% trans 'Last password updated' %}:</td>
-                            <td><b>{{ object.date_password_last_updated|date:"Y-m-j H:i:s" }}</b></td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <td>{% trans 'Comment' %}:</td>
-                        <td><b>{{ object.comment }}</b></td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-    <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
-        <div class="panel panel-primary">
-            <div class="panel-heading">
-                <i class="fa fa-info-circle"></i> {% trans 'Quick modify' %}
-            </div>
-            <div class="panel-body">
-                <table class="table">
-                    <tbody>
-                    <tr class="no-borders-tr">
-                        <td width="50%">{% trans 'Active' %}:</td>
-                        <td>
-                            <span class="pull-right">
-                                <div class="switch">
-                                    <div class="onoffswitch">
-                                        <input type="checkbox" {% if object.is_active %} checked {% endif %} {% if request.user == object %} disabled {% endif %} class="onoffswitch-checkbox" id="is_active">
-                                        <label class="onoffswitch-label" for="is_active">
-                                            <span class="onoffswitch-inner"></span>
-                                            <span class="onoffswitch-switch"></span>
-                                        </label>
-                                    </div>
-                                </div>
-                            </span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Force enabled MFA' %}:</td>
-                        <td>
-                            <span class="pull-right">
-                            <div class="switch">
-                                <div class="onoffswitch">
-                                    <input type="checkbox" class="onoffswitch-checkbox" {% if object.mfa_force_enabled %} checked {% endif %}
-                                           id="force_enable_mfa">
-                                    <label class="onoffswitch-label" for="force_enable_mfa">
-                                        <span class="onoffswitch-inner"></span>
-                                        <span class="onoffswitch-switch"></span>
-                                    </label>
-                                </div>
-                            </div>
-                            </span>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>{% trans 'Reset MFA' %}:</td>
-                        <td>
-                            <span class="pull-right">
-                                <button type="button" class="btn btn-primary btn-xs" id="btn-reset-mfa" style="width: 54px">{% trans 'Reset' %}</button>
-                            </span>
-                        </td>
-                    </tr>
-                    {% if object.can_update_password %}
-                        <tr>
-                            <td>{% trans 'Send reset password mail' %}:</td>
-                            <td>
-                                <span class="pull-right">
-                                    <button type="button" class="btn btn-primary btn-xs" {% if request.user == object %} disabled="disabled" {% endif %} id="btn-reset-password" style="width: 54px">{% trans 'Send' %}</button>
-                                </span>
-                            </td>
-                        </tr>
-                    {% endif %}
-                    {% if object.can_update_ssh_key %}
-                        <tr>
-                            <td>{% trans 'Send reset ssh key mail' %}:</td>
-                            <td>
-                                <span class="pull-right">
-                                    <button type="button" class="btn btn-primary btn-xs" {% if request.user == object %} disabled="disabled" {% endif %} id="btn-reset-pk" style="width: 54px;">{% trans 'Send' %}</button>
-                                </span>
-                            </td>
-                        </tr>
-                    {% endif %}
-                    <tr style="{% if not unblock %}display:none{% endif %}">
-                        <td>{% trans 'Unblock user' %}</td>
-                        <td>
-                            <span class="pull-right">
-                                <button type="button" class="btn btn-primary btn-xs"  id="btn-unblock-user" style="width: 54px">{% trans 'Unblock' %}</button>
-                            </span>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-        {% if request.user.can_admin_current_org %}
-
-            {% if object.can_user_current_org or object.can_admin_current_org %}
-                <div class="panel panel-info">
-                    <div class="panel-heading">
-                        <i class="fa fa-info-circle"></i> {% trans 'User group' %}
-                    </div>
-                    <div class="panel-body">
-                        <table class="table group_edit">
-                            <tbody>
-                            <form>
-                                <tr>
-                                    <td colspan="2" class="no-borders">
-                                        <select data-placeholder="{% trans 'Join user groups' %}" id="groups_selected" class="select2" style="width: 100%" multiple="" tabindex="4">
-                                            {% for group in groups %}
-                                                <option value="{{ group.id }}" id="opt_{{ group.id }}" >{{ group.name }}</option>
-                                            {% endfor %}
-                                        </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2" class="no-borders">
-                                        <button type="button" class="btn btn-info btn-small" id="btn_join_group">{% trans 'Join' %}</button>
-                                    </td>
-                                </tr>
-                            </form>
-
-                            {% for group in object.groups.all %}
-                                <tr>
-                                    <td >
-                                        <b class="bdg_group" >{{ group.name }}</b>
-                                    </td>
-                                    <td>
-                                        <button class="btn btn-danger pull-right btn-xs btn_leave_group" data-uid={{ group.id }} type="button"><i class="fa fa-minus"></i></button>
-                                    </td>
-                                </tr>
-                            {% endfor %}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            {% endif %}
-
-            {% if LICENSE_VALID and LOGIN_CONFIRM_ENABLE %}
-                <div class="panel panel-warning">
-                    <div class="panel-heading">
-                        <i class="fa fa-info-circle"></i> {% trans 'Login confirm' %}
-                    </div>
-                    <div class="panel-body">
-                        <table class="table">
-                            <tbody>
-                            <form>
-                                <tr>
-                                    <td colspan="2" class="no-borders">
-                                        <select data-placeholder="{% trans 'Reviewers' %}" id="id_assignees" class="users-select2" style="width: 100%" multiple="" tabindex="4">
-                                        </select>
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td colspan="2" class="no-borders">
-                                        <button type="button" class="btn btn-warning btn-small" id="btn_reviewer_confirm">{% trans 'Confirm' %}</button>
-                                    </td>
-                                </tr>
-                            </form>
-                            {% if object.get_login_confirm_setting %}
-                                {% for u in object.login_confirm_setting.reviewers.all %}
-                                    <tr>
-                                        <td >
-                                            <b class="bdg_reviewer">{{ u }}</b>
-                                        </td>
-                                        <td>
-                                            <button class="btn btn-danger pull-right btn-xs btn-leave-reviewer" data-uid={{ u.id }} type="button"><i class="fa fa-minus"></i></button>
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            {% endif %}
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            {% endif %}
-
-        {% endif %}
-    </div>
-
-{% include 'users/_user_update_pk_modal.html' %}
-
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-var usersSelect2;
-
-function updateUserLoginReviewer(reviewers) {
-    var url = "{% url 'api-auth:login-confirm-setting-update' user_id=object.id %}";
-    var data = {reviewers: reviewers};
-    requestApi({
-        url: url,
-        data: JSON.stringify(data),
-        method: 'PATCH',
-        success: function () {
-            window.location.reload();
-        }
-    })
-}
-
-
-var usersGroupsRelationUrl = "{% url 'api-users:users-groups-relation-list' %}";
-
-function addObjects(objectsId) {
-    if (!objectsId || objectsId.length === 0) {
-        return
-    }
-    var theUrl = usersGroupsRelationUrl;
-    var body = [];
-    objectsId.forEach(function (v) {
-        var data = {user: "{{ object.id }}"};
-        data["usergroup"] = v;
-        body.push(data)
-    });
-    requestApi({
-        url: theUrl,
-        body: JSON.stringify(body),
-        method: "POST",
-        success: reloadPage
-    });
-}
-
-function removeObject(objectId) {
-    if (!objectId)  {
-        return
-    }
-    var theUrl = usersGroupsRelationUrl;
-    theUrl = setUrlParam(theUrl, 'user', "{{ object.id }}");
-    theUrl = setUrlParam(theUrl, 'usergroup', objectId);
-    requestApi({
-        url: theUrl,
-        method: "DELETE",
-        success: reloadPage
-    });
-}
-
-$(document).ready(function() {
-    $('.select2').select2();
-    usersSelect2 = usersSelect2Init('.users-select2')
-})
-.on('click', '#is_active', function() {
-    var the_url = "{% url 'api-users:user-detail' pk=object.id %}";
-    var checked = $(this).prop('checked');
-    var body = {
-        'is_active': checked
-    };
-    var success = '{% trans "Update successfully!" %}';
-    requestApi({
-        url: the_url,
-        body: JSON.stringify(body),
-        success_message: success
-    });
-})
-.on('click', '#force_enable_mfa', function() {
-    {% if request.user == object %}
-        toastr.error("{% trans 'Goto profile page enable MFA' %}");
-        return;
-    {% endif %}
-
-    var the_url = "{% url 'api-users:user-detail' pk=object.id %}";
-    var checked = $(this).prop('checked');
-    var mfa_level;
-    var otp_secret_key;
-    if(checked){
-        mfa_level = 2
-    }else{
-        mfa_level = 0;
-        otp_secret_key = '';
-    }
-    var body = {
-        'mfa_level': mfa_level,
-        'otp_secret_key': otp_secret_key
-    };
-    var success = '{% trans "Update successfully!" %}';
-    requestApi({
-        url: the_url,
-        body: JSON.stringify(body),
-        success_message: success
-    });
- })
-.on('click', '#btn_join_group', function() {
-    var objectsId = $("#groups_selected").val();
-    addObjects(objectsId);
-}).on('click', '.btn_leave_group', function() {
-    var objectId = $(this).data('uid');
-    removeObject(objectId)
-}).on('click', '#btn-reset-password', function() {
-    function doReset() {
-        var the_url = '{% url "api-users:user-reset-password" pk=object.id %}';
-        var body = {};
-        var success = function() {
-            var msg = "{% trans "An e-mail has been sent to the user`s mailbox." %}";
-            swal("{% trans 'Reset password' %}", msg, "success");
-        };
-        requestApi({
-            url: the_url,
-            body: JSON.stringify(body),
-            success: success
-        });
-    }
-    swal({
-        title: "{% trans 'Are you sure?' %}",
-        text: "{% trans "This will reset the user password and send a reset mail"%}",
-        type: "warning",
-        showCancelButton: true,
-        cancelButtonText: "{% trans 'Cancel' %}",
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: "{% trans 'Confirm' %}",
-        closeOnConfirm: false
-    }, function() {
-        doReset();
-    });
-}).on('click', '#btn-reset-pk', function() {
-    function doReset() {
-        var the_url = '{% url "api-users:user-public-key-reset" pk=object.id %}';
-        var body = {};
-        var success = function() {
-            var msg = "{% trans 'The reset-ssh-public-key E-mail has been sent successfully. Please inform the user to update his new ssh public key.' %}";
-            swal("{% trans 'Reset SSH public key' %}", msg, "success");
-        };
-        requestApi({
-            url: the_url,
-            body: body,
-            success: success
-        });
-    }
-    swal({
-        title: "{% trans 'Are you sure?' %}",
-        text: "{% trans 'This will reset the user public key and send a reset mail' %}",
-        type: "warning",
-        showCancelButton: true,
-        cancelButtonText: "{% trans 'Cancel' %}",
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: "{% trans 'Confirm' %}",
-        closeOnConfirm: false
-    }, function() {
-        doReset();
-    });
-}).on('click', '#btn-user-update-pk', function(){
-    var $this = $(this);
-    var pk = $('#txt_pk').val();
-    var the_url = '{% url "api-users:user-public-key-reset" pk=user.id %}';
-    var body = {'_public_key': pk};
-    var success = function() {
-        $('#txt_pk').val('');
-        $this.closest('.modal').modal('hide');
-        var msg = "{% trans 'Successfully updated the SSH public key.' %}";
-        swal("{% trans 'User SSH public key update' %}", msg, "success");
-    };
-    var fail = function(msg) {
-        swal({
-            title: "{% trans 'User SSH public key update' %}",
-            text: msg,
-            type: "error",
-            showCancelButton: false,
-            confirmButtonColor: "#DD6B55",
-            confirmButtonText: "{% trans 'Confirm' %}",
-            closeOnConfirm: true
-            }, function () {
-              $('#txt_pk').focus();
-            }
-        );
-    };
-    requestApi({ url: the_url, body: JSON.stringify(body), success: success, error: fail});
-}).on('click', '.btn-delete-user', function () {
-    var $this = $(this);
-    var name = "{{ object.name }}";
-    var uid = "{{ object.id }}";
-    var the_url = '{% url "api-users:user-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    var redirect_url = "{% url 'users:user-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-}).on('click', '#btn-unblock-user', function () {
-    function doReset() {
-        {#var the_url = '{% url "api-users:user-reset-password" pk=object.id %}';#}
-        var the_url = '{%  url "api-users:user-unblock" pk=object.id %}';
-        var body = {};
-        var success = function() {
-            var msg = "{% trans "Success" %}";
-            {#swal("{% trans 'Unblock user' %}", msg, "success");#}
-            swal({
-                title: "{% trans 'Unblock user' %}",
-                text: msg,
-                type: "success"
-                }, function() {
-                    location.reload()
-                }
-            );
-        };
-        requestApi({
-            url: the_url,
-            body: JSON.stringify(body),
-            success: success
-        });
-    }
-    swal({
-        title: "{% trans 'Are you sure?' %}",
-        text: "{% trans "After unlocking the user, the user can log in normally."%}",
-        type: "warning",
-        showCancelButton: true,
-        cancelButtonText: "{% trans 'Cancel' %}",
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: "{% trans 'Confirm' %}",
-        closeOnConfirm: false
-    }, function() {
-        doReset();
-    });
-}).on('click', '#btn-reset-mfa', function () {
-    requestApi({
-        url: "{% url 'api-users:user-reset-otp' pk=object.id %}",
-        method: "GET",
-        success_message: "{% trans 'Reset user MFA success' %}"
-    })
-}).on('click', '.btn-leave-reviewer', function () {
-    var reviewersId = [];
-    var removeReviewerId = $(this).data('uid');
-    $('.btn-leave-reviewer').each(function (i, v) {
-        var reviewerId = $(v).data('uid');
-        if (reviewerId !== removeReviewerId) {
-            reviewersId.push(reviewerId);
-        }
-    });
-    updateUserLoginReviewer(reviewersId);
-}).on('click', '#btn_reviewer_confirm', function () {
-    var reviewersId = [];
-    $('.btn-leave-reviewer').each(function (i, v) {
-        var reviewerId = $(v).data('uid');
-        reviewersId.push(reviewerId);
-    });
-    var selectedId = usersSelect2.val();
-    if (selectedId.length === 0) {
-        return
-    }
-    selectedId.forEach(function (i) {
-        if (reviewersId.indexOf(i) === -1) {
-            reviewersId.push(i)
-        }
-    });
-    updateUserLoginReviewer(reviewersId);
-})
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_granted_asset.html b/apps/users/templates/users/user_granted_asset.html
deleted file mode 100644
index 523697153..000000000
--- a/apps/users/templates/users/user_granted_asset.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% extends 'users/_base_user_detail.html' %}
-{% load bootstrap3 %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <link href="{% static 'css/plugins/ztree/awesomeStyle/awesome.css' %}" rel="stylesheet">
-    <script type="text/javascript" src="{% static 'js/plugins/ztree/jquery.ztree.all.min.js' %}"></script>
-{% endblock %}
-
-{% block content_table %}
-{% include 'users/_granted_assets.html' %}
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-var assetTableUrl = "{% url 'api-perms:user-assets' pk=object.id %}?cache_policy=1";
-var selectUrl = '{% url "api-perms:user-node-assets" pk=object.id node_id=DEFAULT_PK %}?cache_policy=1&all=1';
-var treeUrl = "{% url 'api-perms:user-nodes-children-as-tree' pk=object.id %}?cache_policy=1";
-var systemUsersUrl = "{% url 'api-perms:user-asset-system-users' pk=object.id asset_id=DEFAULT_PK %}?cache_policy=1";
-
-$(document).ready(function () {
-    initTree();
-});
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_granted_database_app.html b/apps/users/templates/users/user_granted_database_app.html
deleted file mode 100644
index 7133a9217..000000000
--- a/apps/users/templates/users/user_granted_database_app.html
+++ /dev/null
@@ -1,100 +0,0 @@
-{% extends 'users/_base_user_detail.html' %}
-{% load i18n static %}
-
-{% block custom_head_css_js %}
-    <script src="{% static 'js/jquery.form.min.js' %}"></script>
-{% endblock %}
-
-{% block content_table %}
-<div class="col-sm-10" style="padding-left: 0">
-    <div class="ibox float-e-margins">
-        <div class="ibox-title">
-            <span class="label"><b>{{ object.name }}</b></span>
-            <div class="ibox-tools">
-                <a class="collapse-link">
-                    <i class="fa fa-chevron-up"></i>
-                </a>
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                    <i class="fa fa-wrench"></i>
-                </a>
-                <ul class="dropdown-menu dropdown-user">
-                </ul>
-                <a class="close-link">
-                    <i class="fa fa-times"></i>
-                </a>
-            </div>
-        </div>
-        <div class="ibox-content">
-            <table class="table table-striped table-bordered table-hover " id="database_app_list_table" >
-                <thead>
-                <tr>
-                    <th class="text-center">
-                        <input type="checkbox" id="check_all" class="ipt_check_all" >
-                    </th>
-                    <th class="text-center">{% trans 'Name' %}</th>
-                    <th class="text-center">{% trans 'Type' %}</th>
-                    <th class="text-center">{% trans 'Host' %}</th>
-                    <th class="text-center">{% trans 'Database' %}</th>
-                    <th class="text-center">{% trans 'Comment' %}</th>
-                </tr>
-                </thead>
-                <tbody>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-var inited = false;
-var database_app_table, url;
-
-function initTable() {
-    if (inited){
-        return
-    } else {
-        inited = true;
-    }
-    url = '{% url "api-perms:user-database-apps" pk=object.id %}';
-    var options = {
-        ele: $('#database_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    cellData = htmlEscape(cellData);
-                    {% url 'applications:database-app-detail' pk=DEFAULT_PK as the_url  %}
-                    var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
-                    $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-                }},
-            {targets: 2, createdCell: function (td, cellData, rowData) {
-                    var type = htmlEscape(rowData.get_type_display);
-                    $(td).html(type);
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var host = htmlEscape(cellData);
-                    $(td).html(host);
-                }},
-            {targets: 4, createdCell: function (td, cellData, rowData) {
-                    var database = htmlEscape(cellData);
-                    $(td).html(database);
-                }}
-        ],
-        ajax_url: url,
-        columns: [
-            {data: "id"},
-            {data: "name"},
-            {data: "type"},
-            {data: "host"},
-            {data: "database"},
-            {data: "comment", orderable: false},
-        ]
-    };
-    database_app_table = jumpserver.initServerSideDataTable(options);
-    return database_app_table
-}
-$(document).ready(function(){
-    initTable();
-})
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_granted_remote_app.html b/apps/users/templates/users/user_granted_remote_app.html
deleted file mode 100644
index 19b8ab22c..000000000
--- a/apps/users/templates/users/user_granted_remote_app.html
+++ /dev/null
@@ -1,93 +0,0 @@
-{% extends 'users/_base_user_detail.html' %}
-{% load i18n static %}
-
-{% block custom_head_css_js %}
-    <script src="{% static 'js/jquery.form.min.js' %}"></script>
-{% endblock %}
-
-{% block content_table %}
-    <div class="col-sm-10" style="padding-left: 0">
-        <div class="ibox float-e-margins">
-            <div class="ibox-title">
-                <span class="label"><b>{{ object.name }}</b></span>
-                <div class="ibox-tools">
-                    <a class="collapse-link">
-                        <i class="fa fa-chevron-up"></i>
-                    </a>
-                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                        <i class="fa fa-wrench"></i>
-                    </a>
-                    <ul class="dropdown-menu dropdown-user">
-                    </ul>
-                    <a class="close-link">
-                        <i class="fa fa-times"></i>
-                    </a>
-                </div>
-            </div>
-            <div class="ibox-content">
-                <table class="table table-striped table-bordered table-hover " id="remote_app_list_table" >
-                    <thead>
-                    <tr>
-                        <th class="text-center">
-                            <input type="checkbox" id="check_all" class="ipt_check_all" >
-                        </th>
-                        <th class="text-center">{% trans 'Name' %}</th>
-                        <th class="text-center">{% trans 'App type' %}</th>
-                        <th class="text-center">{% trans 'Asset' %}</th>
-                        <th class="text-center">{% trans 'Comment' %}</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-var inited = false;
-var remote_app_table, url;
-
-function initTable() {
-    if (inited){
-        return
-    } else {
-        inited = true;
-    }
-    url = '{% url "api-perms:user-remote-apps" pk=object.id %}';
-    var options = {
-        ele: $('#remote_app_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    cellData = htmlEscape(cellData);
-                    {% url 'applications:remote-app-detail' pk=DEFAULT_PK as the_url  %}
-                    var detail_btn = '<a href="{{ the_url }}">' + cellData + '</a>';
-                    $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-                }},
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                    $(td).html(rowData.get_type_display)
-                }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                    var hostname = htmlEscape(cellData.hostname);
-                    $(td).html(hostname);
-                }}
-        ],
-        ajax_url: url,
-        columns: [
-            {data: "id"},
-            {data: "name"},
-            {data: "type"},
-            {data: "asset_info", orderable: false},
-            {data: "comment", orderable: false}
-        ]
-    };
-    remote_app_table = jumpserver.initServerSideDataTable(options);
-    return remote_app_table
-}
-$(document).ready(function(){
-    initTable();
-})
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_group_create_update.html b/apps/users/templates/users/user_group_create_update.html
deleted file mode 100644
index 09030eca8..000000000
--- a/apps/users/templates/users/user_group_create_update.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-{% load bootstrap3 %}
-
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="ibox-title">
-                        <h5>{{ action }}</h5>
-                    </div>
-                    <div class="ibox-content">
-                        {% if form.non_field_errors %}
-                            <div class="alert alert-danger">
-                               {{ form.non_field_errors }}
-                            </div>
-                       {% endif %}
-                        <form method="post" class="form-horizontal" action="" >
-                            {% csrf_token %}
-                            {% bootstrap_field form.name layout="horizontal" %}
-                            {% bootstrap_field form.users layout="horizontal" %}
-                            {% bootstrap_field form.comment layout="horizontal" %}
-                            <div class="form-group">
-                                <div class="col-sm-4 col-sm-offset-2">
-                                    <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-                                    <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Confirm' %}</button>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    {% include "users/_select_user_modal.html" %}
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-$(document).ready(function () {
-    $('.select2').select2({
-        closeOnSelect: false
-    });
-    usersSelect2Init('.users-select2')
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url 'api-users:user-group-list' %}';
-    var redirect_to = '{% url "users:user-group-list" %}';
-    var method = "POST";
-    {% if type == "update" %}
-        the_url = '{% url 'api-users:user-group-detail' pk=object.id %}';
-        method = "PUT";
-    {% endif %}
-    var form = $("form");
-    var data = form.serializeObject();
-    objectAttrsIsList(data, ['users']);
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-     };
-    formSubmit(props);
-})
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_group_detail.html b/apps/users/templates/users/user_group_detail.html
deleted file mode 100644
index cd65bb746..000000000
--- a/apps/users/templates/users/user_group_detail.html
+++ /dev/null
@@ -1,168 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
-    <script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
-{% endblock %}
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'users:user-group-detail' pk=user_group.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'User group detail' %} </a>
-                            </li>
-                            <li>
-                                <a href="{% url 'users:user-group-granted-asset' pk=user_group.id %}" class="text-center"><i class="fa fa-cubes"></i> {% trans 'Asset granted' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'users:user-group-update' pk=user_group.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-delete-user-group">
-                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-7" style="padding-left: 0">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label"><b>{{ user_group.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                                            <i class="fa fa-wrench"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <table class="table">
-                                        <tbody>
-                                        <tr class="no-borders-tr">
-                                            <td width="20%">{% trans 'Name' %}:</td>
-                                            <td><b>{{ user_group.name }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Create by' %}:</td>
-                                            <td><b>{{ user_group.created_by }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Date created' %}:</td>
-                                            <td><b>{{ user_group.date_created }}</b></td>
-                                        </tr>
-                                        <tr>
-                                            <td>{% trans 'Comment' %}:</td>
-                                            <td><b>{{ user_group.comment }}</b></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-5" style="padding-left: 0;padding-right: 0">
-                            <div class="panel panel-primary">
-                                <div class="panel-heading">
-                                    <i class="fa fa-info-circle"></i> {% trans 'User' %}
-                                </div>
-                                <div class="panel-body">
-                                    <table class="table user_edit">
-                                        <tbody>
-                                        <form>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <select data-placeholder="{% trans 'Add user' %}" id="slct_users" class="select2" style="width: 100%" multiple="" tabindex="4">
-                                                    </select>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="2" class="no-borders">
-                                                    <button type="button" class="btn btn-primary btn-small" id="btn_add_user">{% trans 'Add' %}</button>
-                                                </td>
-                                            </tr>
-                                        </form>
-
-                                        {% for user in user_group.users.all %}
-                                        <tr>
-                                          <td ><b class="bdg_user" >{{ user.name }}</b></td>
-                                          <td>
-                                              <button class="btn btn-danger pull-right btn-xs btn-remove-user" data-uid={{ user.id }} type="button"><i class="fa fa-minus"></i></button>
-                                          </td>
-                                        </tr>
-                                        {% endfor %}
-                                        </tbody>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-
-var usersGroupsRelationUrl = "{% url 'api-users:users-groups-relation-list' %}";
-
-function addObjects(objectsId) {
-    if (!objectsId || objectsId.length === 0) {
-        return
-    }
-    var theUrl = usersGroupsRelationUrl;
-    var body = [];
-    objectsId.forEach(function (v) {
-        var data = {usergroup: "{{ object.id }}"};
-        data["user"] = v;
-        body.push(data)
-    });
-    requestApi({
-        url: theUrl,
-        body: JSON.stringify(body),
-        method: "POST",
-        success: reloadPage
-    });
-}
-
-function removeObject(objectId, type) {
-    if (!objectId)  {
-        return
-    }
-    var theUrl = usersGroupsRelationUrl;
-    theUrl = setUrlParam(theUrl, 'usergroup', "{{ object.id }}");
-    theUrl = setUrlParam(theUrl, 'user', objectId);
-    requestApi({
-        url: theUrl,
-        method: "DELETE",
-        success: reloadPage
-    });
-}
-
-$(document).ready(function () {
-   $('.select2').select2();
-    usersSelect2Init('#slct_users')
-}).on('click', '.btn-remove-user', function() {
-    var objectId = $(this).data("uid");
-    removeObject(objectId);
-}).on('click', '#btn_add_user', function() {
-    var objectsId = $("#slct_users").val();
-    addObjects(objectsId);
-}).on('click', '.btn-delete-user-group', function () {
-    var $this = $(this);
-    var name = "{{ user_group.name }}";
-    var uid = "{{ user_group.id }}";
-    var the_url = '{% url "api-users:user-group-detail" pk=DEFAULT_PK %}'.replace('{{ DEFAULT_PK }}', uid);
-    var redirect_url = "{% url 'users:user-group-list' %}";
-    objectDelete($this, name, the_url, redirect_url);
-})
-
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_group_granted_asset.html b/apps/users/templates/users/user_group_granted_asset.html
deleted file mode 100644
index 2180e6313..000000000
--- a/apps/users/templates/users/user_group_granted_asset.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends 'base.html' %}
-{% load bootstrap3 %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <link href="{% static 'css/plugins/ztree/awesomeStyle/awesome.css' %}" rel="stylesheet">
-    <script type="text/javascript" src="{% static 'js/plugins/ztree/jquery.ztree.all.min.js' %}"></script>
-{% endblock %}
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li>
-                                <a href="{% url 'users:user-group-detail' pk=object.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'User group detail' %} </a>
-                            </li>
-                            <li  class="active">
-                                <a href="{% url 'users:user-group-granted-asset' pk=object.id %}" class="text-center"><i class="fa fa-cubes"></i> {% trans 'Asset granted' %}</a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        {% include 'users/_granted_assets.html' %}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-var assetTableUrl = "{% url 'api-perms:user-group-assets' pk=object.id %}?cache_policy=1";
-var selectUrl = '{% url "api-perms:user-group-node-assets" pk=object.id node_id=DEFAULT_PK %}?cache_policy=1&all=1';
-var treeUrl = "{% url 'api-perms:user-group-nodes-children-as-tree' pk=object.id %}?cache_policy=1";
-var systemUsersUrl = "{% url 'api-perms:user-group-asset-system-users' pk=object.id asset_id=DEFAULT_PK %}?cache_policy=1";
-var showAssetHref = true; // Need input default true
-
-
-$(document).ready(function () {
-    initTree();
-});
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_group_list.html b/apps/users/templates/users/user_group_list.html
deleted file mode 100644
index 5e354d3db..000000000
--- a/apps/users/templates/users/user_group_list.html
+++ /dev/null
@@ -1,112 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block table_search %}
-    {% include '_csv_import_export.html' %}
-{% endblock %}
-{% block table_container %}
-<div class="pull-left m-r-5"><a href="{% url 'users:user-group-create' %}" class="btn btn-sm btn-primary ">{% trans "Create user group" %}</a></div>
-<table class="table table-striped table-bordered table-hover " id="group_list_table" >
-    <thead>
-        <tr>
-            <th class="text-center">
-                <input id="" type="checkbox" class="ipt_check_all">
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'User' %}</th>
-            <th class="text-center">{% trans 'Comment' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-    </thead>
-</table>
-{% endblock %}
-
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script>
-var groupsTable = 0;
-var usersAmountTpl = '<a class="group-users-amount" data-uid="ID">NUM</a>';
-function initTable() {
-    var options = {
-        ele: $('#group_list_table'),
-        buttons: [],
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                cellData = htmlEscape(cellData);
-                var detail_btn = '<a href="{% url "users:user-group-detail" pk=DEFAULT_PK %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-             }},
-            {targets: 2, createdCell: function (td, cellData, rowData) {
-                var data = usersAmountTpl
-                    .replace("ID", rowData.id)
-                    .replace('NUM', cellData);
-                $(td).html(data);
-             }},
-            {targets: 3, createdCell: function (td, cellData) {
-                cellData = htmlEscape(cellData);
-                var innerHtml = cellData.length > 30 ? cellData.substring(0, 30) + '...': cellData;
-                $(td).html('<span href="javascript:void(0);" data-toggle="tooltip" title="' + cellData + '">' + innerHtml + '</span>');
-            }},
-            {targets: 4, createdCell: function (td, cellData, rowData) {
-                var name = htmlEscape(rowData.name);
-                var update_btn = '<a href="{% url "users:user-group-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'
-                        .replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_delete_user_group" data-gid="{{ DEFAULT_PK }}" data-name="99991938">{% trans "Delete" %}</a>'
-                        .replace('{{ DEFAULT_PK }}', cellData)
-                        .replace('99991938', name);
-                if (rowData.id === 1) {
-                    $(td).html(update_btn)
-                } else {
-                    $(td).html(update_btn + del_btn)
-                }
-            }}
-        ],
-        ajax_url: '{% url "api-users:user-group-list" %}',
-        columns: [{data: "id"}, {data: "name" }, {data: "users_amount", orderable: false},
-                  {data: "comment"}, {data: "id", orderable: false, width: "120px"}],
-        op_html: $('#actions').html()
-    };
-    groupsTable = jumpserver.initServerSideDataTable(options);
-    return groupsTable
-}
-
-var usersGroupsRelationUrl = "{% url 'api-users:users-groups-relation-list' %}";
-
-function getGroupUsers(groupId, callback) {
-    var theUrl = setUrlParam(usersGroupsRelationUrl, "usergroup", groupId);
-    if (!callback) {
-        callback = function (data) {
-            console.log(data)
-        }
-    }
-    requestApi({
-        url: theUrl,
-        method: "GET",
-        success: callback,
-        flash_message: false,
-    })
-}
-$(document).ready(function() {
-    groupsTable = initTable();
-    initCsvImportExport(groupsTable, "{% trans 'User groups' %}")
-}).on('click', '.btn_delete_user_group', function(){
-    var $this = $(this);
-    var group_id = $this.data('gid');
-    var name = $this.data('name');
-    var the_url = "{% url 'api-users:user-group-detail' pk=DEFAULT_PK %}".replace('{{ DEFAULT_PK }}', group_id);
-    objectDelete($this, name, the_url)
-})
-.on('click', '.group-users-amount', function () {
-    var $this = $(this);
-    var groupId = $(this).data("uid");
-    getGroupUsers(groupId, function (data) {
-        var groups = [];
-        data.forEach(function (v) {
-            groups.push(v.user_display);
-        });
-        var popover = createPopover(groups);
-        $this.parent().html(popover);
-        $(popover).trigger('click');
-    })
-});
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_list.html b/apps/users/templates/users/user_list.html
deleted file mode 100644
index 28b30f73d..000000000
--- a/apps/users/templates/users/user_list.html
+++ /dev/null
@@ -1,280 +0,0 @@
-{% extends '_base_list.html' %}
-{% load i18n static %}
-{% block table_search %}
-    {% include '_csv_import_export.html' %}
-{% endblock %}
-{% block table_container %}
-<div class="uc pull-left m-r-5"><a href="{% url "users:user-create" %}" class="btn btn-sm btn-primary"> {% trans "Create user" %} </a></div>
-<table class="table table-striped table-bordered table-hover " id="user_list_table">
-    <thead>
-        <tr>
-            <th class="text-center">
-                <input id="" type="checkbox" class="ipt_check_all">
-            </th>
-            <th class="text-center">{% trans 'Name' %}</th>
-            <th class="text-center">{% trans 'Username' %}</th>
-            <th class="text-center">{% trans 'Role' %}</th>
-            <th class="text-center">{% trans 'User group' %}</th>
-            <th class="text-center">{% trans 'Source' %}</th>
-            <th class="text-center">{% trans 'Validity' %}</th>
-            <th class="text-center">{% trans 'Action' %}</th>
-        </tr>
-    </thead>
-    <tbody>
-    </tbody>
-</table>
-<div id="actions" class="hide">
-    <div class="input-group">
-        <select class="form-control m-b" style="width: auto" id="slct_bulk_update">
-            {% if CURRENT_ORG.is_default %}
-                <option value="delete">{% trans 'Delete selected' %}</option>
-            {% else %}
-                <option value="remove">{% trans 'Remove selected' %}</option>
-            {% endif %}
-            <option value="update">{% trans 'Update selected' %}</option>
-            <option value="deactive">{% trans 'Deactive selected' %}</option>
-            <option value="active">{% trans 'Active selected' %}</option>
-        </select>
-        <div class="input-group-btn pull-left" style="padding-left: 5px;">
-            <button id='btn_bulk_update' style="height: 32px;"  class="btn btn-sm btn-primary">
-             {% trans 'Submit' %}
-            </button>
-        </div>
-    </div>
-</div>
-{% endblock %}
-{% block content_bottom_left %}{% endblock %}
-{% block custom_foot_js %}
-<script src="{% static 'js/jquery.form.min.js' %}"></script>
-<script>
-var usersTable = 0;
-function initTable() {
-     var options = {
-        ele: $('#user_list_table'),
-        columnDefs: [
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                cellData = htmlEscape(cellData);
-                var detail_btn = '<a href="{% url "users:user-detail" pk=DEFAULT_PK %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace("{{ DEFAULT_PK }}", rowData.id));
-             }},
-            {targets: 3, createdCell: function (td, cellData, rowData) {
-                $(td).html(rowData.role_display);
-             }},
-            {targets: 4, createdCell: function (td, cellData) {
-                var innerHtml = cellData.length > 20 ? cellData.substring(0, 20) + '...': cellData;
-                $(td).html('<span href="javascript:void(0);" data-toggle="tooltip" title="' + cellData + '">' + innerHtml + '</span>');
-             }},
-            {targets: 5, createdCell: function (td, cellData, rowData) {
-                $(td).html(rowData.source_display);
-             }},
-            {targets: 6, createdCell: function (td, cellData, rowData) {
-                if (cellData) {
-                    $(td).html('<i class="fa fa-check text-navy"></i>')
-                } else if (!rowData.is_active) {
-
-                    $(td).html('<i class="fa fa-times text-danger inactive"></i>')
-                } else if (rowData.is_expired) {
-                    $(td).html('<i class="fa fa-times text-danger expired"></i>')
-                }
-             }},
-            {targets: 7, createdCell: function (td, cellData, rowData) {
-                var name = htmlEscape(rowData.name);
-                var update_btn = "";
-                if (rowData.can_update === false){
-                    update_btn = '<a class="btn btn-xs disabled btn-info">{% trans "Update" %}</a>';
-                }
-                else{
-                    update_btn = '<a href="{% url "users:user-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('00000000-0000-0000-0000-000000000000', cellData);
-                }
-
-                var del_btn = "";
-                var rm_btn = "";
-                if ("{{ CURRENT_ORG }}" === 'DEFAULT'){
-                    if (rowData.can_delete === false){
-                        del_btn = '<a class="btn btn-xs btn-danger m-l-xs" disabled>{% trans "Delete" %}</a>'
-                            .replace('{{ DEFAULT_PK }}', cellData)
-                            .replace('99991938', name);
-                    } else {
-                        del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn_user_delete" data-action="delete" data-uid="{{ DEFAULT_PK }}" data-name="99991938">{% trans "Delete" %}</a>'
-                            .replace('{{ DEFAULT_PK }}', cellData)
-                            .replace('99991938', name);
-                    }
-                    $(td).html(update_btn + del_btn)
-                }
-                else{
-                    if (rowData.can_delete === false){
-                        rm_btn = '<a class="btn btn-xs btn-warning m-l-xs" disabled>{% trans "Remove" %}</a>'
-                            .replace('{{ DEFAULT_PK }}', cellData)
-                            .replace('99991938', name);
-                    } else {
-                        rm_btn = '<a class="btn btn-xs btn-warning m-l-xs btn_user_delete" data-action="remove" data-uid="{{ DEFAULT_PK }}" data-name="99991938">{% trans "Remove" %}</a>'
-                            .replace('{{ DEFAULT_PK }}', cellData)
-                            .replace('99991938', name);
-                    }
-                    $(td).html(update_btn + rm_btn)
-                }
-             }}],
-        ajax_url: '{% url "api-users:user-list" %}',
-        columns: [
-            {data: "id"}, {data: "name" }, {data: "username" },
-            {data: "role"},
-            {data: "groups_display", orderable: false},
-            {data: "source"},
-            {data: "is_valid", orderable: false, width: "50px"},
-            {data: "id", orderable: false, width: "120px"}
-        ],
-        op_html: $('#actions').html()
-    };
-    usersTable = jumpserver.initServerSideDataTable(options);
-    return usersTable
-}
-
-
-$(document).ready(function(){
-    usersTable = initTable();
-    initCsvImportExport(usersTable, "{% trans 'User' %}")
-}).on('click', '#btn_bulk_update', function(){
-    var action = $('#slct_bulk_update').val();
-    var id_list = usersTable.selected;
-    if (id_list.length === 0) {
-        return false;
-    }
-    var the_url = "{% url 'api-users:user-list' %}";
-    var data = {
-        'resources': id_list
-    };
-    function reloadPage() {
-        setTimeout( function () {window.location.reload();}, 300);
-    }
-    function doDeactive() {
-        var data = [];
-        $.each(id_list, function(index, object_id) {
-            var obj = {"pk": object_id, "is_active": false};
-            data.push(obj);
-        });
-        requestApi({
-            url: the_url,
-            method: 'PATCH',
-            body: JSON.stringify(data),
-            success: reloadPage
-        });
-    }
-    function doActive() {
-        var data = [];
-        $.each(id_list, function(index, object_id) {
-            var obj = {"pk": object_id, "is_active": true};
-            data.push(obj);
-        });
-        requestApi({
-            url: the_url,
-            method: 'PATCH',
-            body: JSON.stringify(data),
-            success: reloadPage
-        });
-    }
-    function doDelete(props) {
-        props = props || {};
-        swal({
-            title: "{% trans 'Are you sure?' %}",
-            text: props.text || "{% trans 'This will delete the selected users !!!' %}",
-            type: "warning",
-            showCancelButton: true,
-            cancelButtonText: "{% trans 'Cancel' %}",
-            confirmButtonColor: "#DD6B55",
-            confirmButtonText: "{% trans 'Confirm' %}",
-            closeOnConfirm: false
-        },function () {
-            function success(data) {
-                url = setUrlParam(the_url, 'spm', data.spm);
-                function fail() {
-                    var msg = "{% trans 'User Deleting failed.' %}";
-                    swal("{% trans 'User Delete' %}", msg, "error");
-                }
-                requestApi({
-                    url:url,
-                    method:'DELETE',
-                    flash_message:true,
-                    success:reloadPage,
-                    error: props.fail || fail
-                 });
-            }
-            requestApi({
-                url: "{% url 'api-common:resources-cache' %}",
-                method:'POST',
-                body:JSON.stringify(data),
-                flash_message:false,
-                success:success,
-             })
-        })
-    }
-
-    function doRemove(){
-        var props = {
-            text: "{% trans 'This will remove the selected users !!' %}",
-            fail: function fail(){
-                var msg = "{% trans 'User Removing failed.' %}";
-                swal("{% trans 'User Remove' %}", msg, "error");
-            }
-        };
-        doDelete(props);
-    }
-
-    function doUpdate() {
-        function fail(data) {
-            toastr.error(JSON.parse(data))
-        }
-        function success(data) {
-            var url = "{% url 'users:user-bulk-update' %}";
-            location.href= setUrlParam(url, 'spm', data.spm);
-         }
-        requestApi({
-                url: "{% url 'api-common:resources-cache' %}",
-                method:'POST',
-                body:JSON.stringify(data),
-                flash_message:false,
-                success:success,
-                error:fail
-        })
-     }
-    switch(action) {
-        case 'deactive':
-            doDeactive();
-            break;
-        case 'delete':
-            doDelete();
-            break;
-        case 'remove':
-            doRemove();
-            break;
-        case 'update':
-            doUpdate();
-            break;
-        case 'active':
-            doActive();
-            break;
-        default:
-            break;
-    }
-}).on('click', '.btn_user_delete', function(){
-    var $this = $(this);
-    var name = $this.data('name');
-    var uid = $this.data('uid');
-    var action = $this.data('action');
-    var title, success_message = null;
-    if (action === 'remove'){
-        title = "{% trans 'Are you sure about removing it?' %}";
-        success_message = "{% trans 'Remove the success' %}";
-    }
-    var the_url = '{% url "api-users:user-detail" pk=DEFAULT_PK %}'.replace("{{ DEFAULT_PK }}", uid);
-    objectDelete($this, name, the_url, null, title, success_message);
-}).on('click', '.expired', function () {
-    var msg = '{% trans "User is expired" %}';
-    toastr.error(msg)
-}).on('click', '.inactive', function () {
-    var msg = '{% trans 'User is inactive' %}';
-    toastr.error(msg)
-
-})
-</script>
-{% endblock %}
-
diff --git a/apps/users/templates/users/user_profile.html b/apps/users/templates/users/user_profile.html
deleted file mode 100644
index d1f77c7d0..000000000
--- a/apps/users/templates/users/user_profile.html
+++ /dev/null
@@ -1,233 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
-    <script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
-{% endblock %}
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Profile' %} </a>
-                            </li>
-                            <li class="pull-right">
-                                <a class="btn btn-outline btn-default" href="{% url 'users:user-profile-update' %}"><i class="fa fa-edit"></i>{% trans 'Setting' %}</a>
-                            </li>
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="col-sm-8" style="padding-left: 0;">
-                            <div class="ibox float-e-margins">
-                                <div class="ibox-title">
-                                    <span class="label label-primary"><b>{{ user.name }}</b></span>
-                                    <div class="ibox-tools">
-                                        <a class="collapse-link">
-                                            <i class="fa fa-chevron-up"></i>
-                                        </a>
-                                        <a class="close-link">
-                                            <i class="fa fa-times"></i>
-                                        </a>
-                                    </div>
-                                </div>
-                                <div class="ibox-content">
-                                    <div class="text-left">
-                                        <table class="table">
-                                            <tr class="no-borders-tr">
-                                                <td colspan="2">
-                                                    <img src="{{ user.avatar_url }}" class="img-circle" width="64" height="64">
-                                                </td>
-                                            </tr>
-                                            <tr class="no-borders-tr">
-                                                <td class="text-navy">{% trans 'Username' %}</td>
-                                                <td>{{ user.username }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Name' %}</td>
-                                                <td>{{ user.name }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Role' %}</td>
-                                                <td>{{ user.get_role_display }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Email' %}</td>
-                                                <td>{{ user.email }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Active' %}</td>
-                                                <td>{{ user.is_active|yesno:"Yes,No,Unkown" }}</td>
-                                            </tr>
-
-                                            {% if user.can_update_ssh_key %}
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Public key' %}</td>
-                                                <td>
-                                                    <table>
-                                                        <tr>
-                                                            <td>
-                                                                {{ user.public_key_obj.comment }}
-                                                            </td>
-                                                        </tr>
-                                                        <tr>
-                                                            <td>
-                                                                {{ user.public_key_obj.hash_md5 }}
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            {% endif %}
-                                            <tr>
-                                                <td class="text-navy">{% trans 'MFA' %}</td>
-                                                <td>
-                                                    {% if user.mfa_force_enabled %}
-                                                        {% trans 'Force enable' %}
-                                                    {% elif  user.mfa_enabled%}
-                                                        {% trans 'Enable' %}
-                                                    {% else %}
-                                                        {% trans 'Disable' %}
-                                                    {% endif %}
-                                                    {% if mfa_setting %}
-                                                        ( {% trans 'Administrator Settings force MFA login' %} )
-                                                    {% endif %}
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Source' %}</td>
-                                                <td>{{ user.get_source_display }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Date joined' %}</td>
-                                                <td>{{ user.date_joined|date:"Y-m-d H:i:s" }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Last login' %}</td>
-                                                <td>{{ user.last_login|date:"Y-m-d H:i:s" }}</td>
-                                            </tr>
-                                            {% if user.can_update_password %}
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Last password updated' %}</td>
-                                                <td>{{ user.date_password_last_updated|date:"Y-m-d H:i:s" }}</td>
-                                            </tr>
-                                            {% endif %}
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Date expired' %}</td>
-                                                <td>{{ user.date_expired|date:"Y-m-d H:i:s" }}</td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-navy">{% trans 'User groups' %}</td>
-                                                <td>
-                                                    <table>
-                                                        {% for group in user.groups.all %}
-                                                        <tr>
-                                                        <td>
-                                                            {{ group.name }}
-                                                        </td>
-                                                        </tr>
-                                                        {% endfor %}
-                                                    </table>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td class="text-navy">{% trans 'Comment' %}:</td>
-                                                <td><b>{{ user.comment }}</b></td>
-                                            </tr>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-sm-4" style="padding-left: 0;padding-right: 0">
-                        <div class="panel panel-primary">
-                            <div class="panel-heading">
-                                <i class="fa fa-info-circle"></i> {% trans 'Quick modify' %}
-                            </div>
-                            <div class="panel-body">
-                                <table class="table">
-                                    <tbody>
-                                    <tr class="no-borders-tr">
-                                        <td>{% trans 'Set MFA' %}:</td>
-                                        <td>
-                                            <span class="pull-right">
-                                                <a type="button" class="btn btn-primary btn-xs" style="width: 54px" id=""
-                                                   href="
-                                                        {% if request.user.mfa_enabled %}
-                                                            {% if request.user.mfa_force_enabled %}
-                                                                " disabled >{% trans 'Disable' %}
-                                                            {% else %}
-                                                                {% url 'authentication:user-otp-disable-authentication' %}
-                                                                ">{% trans 'Disable' %}
-                                                            {% endif %}
-                                                        {% else %}
-                                                            {% url 'authentication:user-otp-enable-start' %}
-                                                            ">{% trans 'Enable' %}
-                                                        {% endif %}
-                                                </a>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                    {% if request.user.mfa_enabled %}
-                                    <tr>
-                                        <td>{% trans 'Update MFA' %}:</td>
-                                        <td>
-                                            <span class="pull-right">
-                                                <a type="button" class="btn btn-primary btn-xs" style="width: 54px" href="{% url 'authentication:user-otp-update' %}">{% trans 'Update' %}</a>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                    {% endif %}
-                                    {% if request.user.can_update_password %}
-                                    <tr class="no-borders">
-                                        <td>{% trans 'Update password' %}:</td>
-                                        <td>
-                                            <span class="pull-right">
-                                                <a type="button" class="btn btn-primary btn-xs" style="width: 54px" href="{% url 'users:user-password-update' %}">{% trans 'Update' %}</a>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                    {% endif %}
-                                    {% if request.user.can_update_ssh_key %}
-                                    <tr>
-                                        <td>{% trans 'Update SSH public key' %}:</td>
-                                        <td>
-                                            <span class="pull-right">
-                                                <a type="button" class="btn btn-primary btn-xs" style="width: 54px" href="{% url 'users:user-pubkey-update' %}">{% trans 'Update' %}</a>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>{% trans 'Reset public key and download' %}:</td>
-                                        <td>
-                                            <span class="pull-right">
-                                                <a type="button" class="btn btn-primary btn-xs btn-reset-pubkey" style="width: 54px">{% trans 'Reset' %}</a>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                    {% endif %}
-                                    </tbody>
-                                </table>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-{% block custom_foot_js %}
-<script>
-$(document).ready(function () {
-})
-.on('click', '.btn-reset-pubkey', function () {
-    var the_url = '{% url "users:user-pubkey-generate" %}';
-    window.open(the_url, "_blank")
-})
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_profile_update.html b/apps/users/templates/users/user_profile_update.html
deleted file mode 100644
index e59edeccc..000000000
--- a/apps/users/templates/users/user_profile_update.html
+++ /dev/null
@@ -1,84 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-{% load bootstrap3 %}
-
-{% block custom_head_css_js %}
-    <link href="{% static "css/plugins/cropper/cropper.min.css" %}" rel="stylesheet">
-    <link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
-    <script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
-
-    <style>
-        .crop {
-            width: 200px;
-            height: 150px;
-            overflow: hidden;
-        }
-
-        .img-preview-sm img {
-            width: 64px;
-            height: 64px;
-            margin: -75px 0 0 -100px;
-        }
-
-        img {
-            max-width: 100%; /* This rule is very important, please do not ignore this! */
-        }
-    </style>
-{% endblock %}
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li class="active">
-                                <a href="{% url 'users:user-profile-update' %}" class="text-center">{% trans 'Profile' %} </a>
-                            </li>
-                            {% if request.user.can_update_password %}
-                            <li>
-                                <a href="{% url 'users:user-password-update' %}" class="text-center">{% trans 'Password' %} </a>
-                            </li>
-                            {% endif %}
-                            {% if request.user.can_update_ssh_key %}
-                            <li>
-                                <a href="{% url 'users:user-pubkey-update' %}" class="text-center">{% trans 'Public key' %} </a>
-                            </li>
-                            {% endif %}
-                        </ul>
-                    </div>
-                    <div class="tab-content" style="background-color: #ffffff">
-                        <div class="wrapper wrapper-content animated fadeInRight">
-                                <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
-                                    {% csrf_token %}
-                                    <h3>{% trans 'Account' %}</h3>
-                                    {% bootstrap_field form.username layout="horizontal" %}
-                                    {% bootstrap_field form.name layout="horizontal" %}
-                                    {% bootstrap_field form.email layout="horizontal" %}
-
-                                    <div class="hr-line-dashed"></div>
-                                    <h3>{% trans 'Profile' %}</h3>
-                                    {% bootstrap_field form.phone layout="horizontal" %}
-                                    {% bootstrap_field form.wechat layout="horizontal" %}
-                                    <div class="hr-line-dashed"></div>
-                                    <div class="form-group">
-                                        <div class="col-sm-4 col-sm-offset-2">
-                                            <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-                                            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-{% endblock %}
-
-{% block custom_foot_js %}
-    <script src="{% static 'js/plugins/cropper/cropper.min.js' %}"></script>
-    <script>
-    </script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_pubkey_update.html b/apps/users/templates/users/user_pubkey_update.html
deleted file mode 100644
index 4ab03f01c..000000000
--- a/apps/users/templates/users/user_pubkey_update.html
+++ /dev/null
@@ -1,102 +0,0 @@
-{% extends 'base.html' %}
-{% load static %}
-{% load i18n %}
-{% load bootstrap3 %}
-
-{% block custom_head_css_js %}
-    <link href="{% static "css/plugins/cropper/cropper.min.css" %}" rel="stylesheet">
-    <link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
-    <script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
-
-    <style>
-        .crop {
-            width: 200px;
-            height: 150px;
-            overflow: hidden;
-        }
-
-        .img-preview-sm img {
-            width: 64px;
-            height: 64px;
-            margin: -75px 0 0 -100px;
-        }
-
-        img {
-            max-width: 100%; /* This rule is very important, please do not ignore this! */
-        }
-    </style>
-{% endblock %}
-{% block content %}
-    <div class="wrapper wrapper-content animated fadeInRight">
-        <div class="row">
-            <div class="col-sm-12">
-                <div class="ibox float-e-margins">
-                    <div class="panel-options">
-                        <ul class="nav nav-tabs">
-                            <li>
-                                <a href="{% url 'users:user-profile-update' %}" class="text-center">{% trans 'Profile' %} </a>
-                            </li>
-                            {% if request.user.can_update_password %}
-                            <li>
-                                <a href="{% url 'users:user-password-update' %}" class="text-center">{% trans 'Password' %} </a>
-                            </li>
-                            {% endif %}
-                            {% if request.user.can_update_ssh_key %}
-                            <li class="active">
-                                <a href="{% url 'users:user-pubkey-update' %}" class="text-center">{% trans 'Public key' %} </a>
-                            </li>
-                            {% endif %}
-                        </ul>
-                    </div>
-                    <div class="tab-content" style="background-color: #ffffff">
-                        <div class="wrapper wrapper-content animated fadeInRight">
-                                <form method="post" class="form-horizontal" action="" enctype="multipart/form-data">
-                                    {% csrf_token %}
-                                    <h3>{% trans 'Old public key' %}</h3>
-                                    <div class="form-group">
-                                        <label class="control-label col-sm-2 col-lg-2" style="padding-top: 0" >{% trans 'Name' %}</label>
-                                        <div class=" col-sm-9 col-lg-9">
-                                            <label>{{ user.public_key_obj.comment }}</label>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <label class="control-label col-sm-2 col-lg-2" style="padding-top: 0">{% trans 'Fingerprint' %}</label>
-                                        <div class=" col-sm-9 col-lg-9 ">
-                                            <label>{{ user.public_key_obj.hash_md5 }}</label>
-                                        </div>
-                                    </div>
-                                    <div class="hr-line-dashed"></div>
-                                    <h3>{% trans 'Update public key' %}</h3>
-                                    {% bootstrap_field form.public_key layout="horizontal" %}
-                                    <div class="form-group">
-                                        <label class="control-label col-sm-2 col-lg-2" style="padding-top: 0">{% trans 'Or reset by server' %}</label>
-                                        <div class=" col-sm-9 col-lg-9 ">
-                                            <a id="reset_pubkey" href="{% url 'users:user-pubkey-generate' %}">{% trans 'Reset' %}</a>
-                                        </div>
-                                    </div>
-                                    <div class="hr-line-dashed"></div>
-                                    <div class="form-group">
-                                        <div class="col-sm-4 col-sm-offset-2">
-                                            <button class="btn btn-white" type="reset">{% trans 'Reset' %}</button>
-                                            <button id="submit_button" class="btn btn-primary" type="submit">{% trans 'Submit' %}</button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-{% endblock %}
-
-{% block custom_foot_js %}
-    <script src="{% static 'js/plugins/cropper/cropper.min.js' %}"></script>
-    <script>
-    $(document).ready(function () {
-    }).on('click', '#reset_pubkey', function () {
-        var message = "{% trans 'The new public key has been set successfully, Please download the corresponding private key.' %}";
-        toastr.success(message)
-    })
-    </script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_remote_app_permission.html b/apps/users/templates/users/user_remote_app_permission.html
deleted file mode 100644
index d1f6aabb7..000000000
--- a/apps/users/templates/users/user_remote_app_permission.html
+++ /dev/null
@@ -1,168 +0,0 @@
-{% extends 'users/_base_user_detail.html' %}
-{% load static %}
-{% load i18n %}
-
-{% block custom_head_css_js %}
-    <link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
-    <script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
-{% endblock %}
-
-{% block content_table %}
-<div class="col-sm-10" style="padding-left: 0">
-    <div class="ibox float-e-margins">
-        <div class="ibox-title">
-            <span class="label"><b>{{ object.name }}</b></span>
-            <div class="ibox-tools">
-                <a class="collapse-link">
-                    <i class="fa fa-chevron-up"></i>
-                </a>
-                <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-                    <i class="fa fa-wrench"></i>
-                </a>
-                <ul class="dropdown-menu dropdown-user">
-                </ul>
-                <a class="close-link">
-                    <i class="fa fa-times"></i>
-                </a>
-            </div>
-        </div>
-        <div class="ibox-content">
-            <table class="table table-striped table-bordered table-hover"
-                   id="permission_list_table"
-                   style="width: 100%">
-                <thead>
-                <tr>
-                    <th></th>
-                    <th>{% trans 'Name' %}</th>
-                    <th class="text-center">{% trans 'User' %}</th>
-                    <th class="text-center">{% trans 'User group' %}</th>
-                    <th class="text-center">{% trans 'RemoteApp' %}</th>
-                    <th class="text-center">{% trans 'System user' %}</th>
-                    <th class="text-center">{% trans 'Validity' %}</th>
-                    <th class="text-center">{% trans 'Action' %}</th>
-                </tr>
-                </thead>
-                <tbody>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</div>
-{% endblock %}
-
-{% block custom_foot_js %}
-<script>
-function format(d) {
-    var data = "";
-    if (d.users.length > 0 ) {
-        data += makeLabel(["{% trans 'User' %}", d.users.join(", ")])
-    }
-    if (d.user_groups.length > 0) {
-        data += makeLabel(["{% trans 'User group' %}", d.user_groups.join(", ")])
-    }
-    if (d.remote_apps.length > 0) {
-       data += makeLabel(["{% trans 'RemoteApp' %}", d.remote_apps.join(", ")])
-    }
-    if (d.system_users.length > 0) {
-        data += makeLabel(["{% trans 'System user' %}", d.system_users.join(", ")])
-    }
-    return data
-}
-function initTable() {
-    var options = {
-        ele: $('#permission_list_table'),
-        toggle: true,
-        columnDefs: [
-            {targets: 0, createdCell: function (td, cellData, rowData) {
-                $(td).addClass("toggle");
-                $(td).html("<i class='fa fa-angle-right'></i>");
-            }},
-            {targets: 1, createdCell: function (td, cellData, rowData) {
-                cellData = htmlEscape(cellData);
-                var detail_btn = '<a href="{% url "perms:remote-app-permission-detail" pk=DEFAULT_PK %}">' + cellData + '</a>';
-                $(td).html(detail_btn.replace('{{ DEFAULT_PK }}', rowData.id));
-            }},
-            {targets: 2, createdCell: function (td, cellData) {
-                var num = cellData.length;
-                $(td).html(num);
-            }},
-            {targets: 3, createdCell: function (td, cellData) {
-                var num = cellData.length;
-                $(td).html(num);
-            }},
-            {targets: 4, createdCell: function (td, cellData) {
-                var num = cellData.length;
-                $(td).html(num);
-            }},
-            {targets: 5, createdCell: function (td, cellData) {
-                var num = cellData.length;
-                $(td).html(num);
-            }},
-            {targets: 6, createdCell: function (td, cellData) {
-                if (!cellData) {
-					$(td).html('<i class="fa fa-times text-danger"></i>')
-				} else {
-					$(td).html('<i class="fa fa-check text-navy"></i>')
-				}
-            }},
-            {targets: 7, createdCell: function (td, cellData, rowData) {
-                var name = htmlEscape(rowData.name);
-                var update_btn = '<a href="{% url "perms:remote-app-permission-update" pk=DEFAULT_PK %}" class="btn btn-xs m-l-xs btn-info">{% trans "Update" %}</a>'.replace('{{ DEFAULT_PK }}', cellData);
-                var del_btn = '<a class="btn btn-xs btn-danger m-l-xs btn-del" data-uid="{{ DEFAULT_PK }}" mark=1 data-name="99991938">{% trans "Delete" %}</a>'
-                    .replace('{{ DEFAULT_PK }}', cellData)
-                    .replace('99991938', name);
-				$(td).html(update_btn + del_btn);
-            }}
-        ],
-        ajax_url: '{% url "api-perms:remote-app-permission-list" %}?user_id={{ object.id }}',
-        columns: [
-            {data: "id"}, {data: "name"}, {data: "users", orderable: false},
-            {data: "user_groups", orderable: false}, {data: "remote_apps", orderable: false},
-            {data: "system_users", orderable: false}, {data: "is_valid", orderable: false},
-            {data: "id", orderable: false, width: "120px"}
-        ],
-        select: {},
-        op_html: $('#actions').html()
-    };
-    table = jumpserver.initServerSideDataTable(options);
-    return table
-}
-
-$(document).ready(function() {
-   initTable();
-})
-.on('click', '.toggle', function (e) {
-    e.preventDefault();
-    var detailRows = [];
-    var tr = $(this).closest('tr');
-    var row = table.row(tr);
-    var idx = $.inArray(tr.attr('id'), detailRows);
-
-    if (row.child.isShown()) {
-        tr.removeClass('details');
-        $(this).children('i:first-child').removeClass('fa-angle-down').addClass('fa-angle-right');
-        row.child.hide();
-
-        // Remove from the 'open' array
-        detailRows.splice(idx, 1);
-    }
-    else {
-        tr.addClass('details');
-        $(this).children('i:first-child').removeClass('fa-angle-right').addClass('fa-angle-down');
-        row.child(format(row.data())).show();
-        // Add to the 'open' array
-        if ( idx === -1 ) {
-            detailRows.push(tr.attr('id'));
-        }
-    }
-})
-.on('click', '.btn-del', function () {
-    var $this = $(this);
-    var uid = $this.data('uid');
-    var name = $this.data('name');
-    var the_url = '{% url "api-perms:remote-app-permission-detail" pk=DEFAULT_PK %}'
-            .replace('{{ DEFAULT_PK }}', uid);
-    objectDelete($this, name, the_url);
-})
-</script>
-{% endblock %}
diff --git a/apps/users/templates/users/user_update.html b/apps/users/templates/users/user_update.html
deleted file mode 100644
index 182ec88aa..000000000
--- a/apps/users/templates/users/user_update.html
+++ /dev/null
@@ -1,117 +0,0 @@
-{% extends 'users/_user.html' %}
-{% load i18n %}
-{% load bootstrap3 %}
-{% block user_template_title %}{% trans "Update user" %}{% endblock %}
-{% block password %}
-    {% if object.can_update_password %}
-    {% bootstrap_field form.password layout="horizontal" %}
-    {#  密码popover  #}
-    <div id="container">
-        <div class="popover fade bottom in" role="tooltip" id="popover777" style=" display: none; width:260px;">
-            <div class="arrow" style="left: 50%;"></div>
-            <h3 class="popover-title" style="display: none;"></h3>
-            <h4>{% trans 'Your password must satisfy' %}</h4><div id="id_password_rules" style="color: #908a8a; margin-left:20px; font-size:15px;"></div>
-            <h4 style="margin-top: 10px;">{% trans 'Password strength' %}</h4><div id="id_progress"></div>
-            <div class="popover-content"></div>
-        </div>
-    </div>
-    {% else %}
-    <div class="form-group">
-        <label class="col-sm-2 control-label">{% trans 'Password' %}</label>
-        <div class="col-sm-8 controls" style="margin-top: 8px;" id="password_help_text">
-            {% trans 'User auth from {}, go there change password' %}
-        </div>
-    </div>
-    {% endif %}
-    {% if object.can_update_ssh_key %}
-    {% bootstrap_field form.public_key layout="horizontal" %}
-    {% else %}
-        <div class="form-group">
-            <label class="col-sm-2 control-label">{% trans 'ssh public key' %}</label>
-            <div class="col-sm-8 controls" style="margin-top: 8px;" id="ssh_key_help_text">
-                {% trans 'User auth from {}, ssh key login is not supported' %}
-            </div>
-        </div>
-    {% endif %}
-{% endblock %}
-
-{% block custom_foot_js %}
-    {{ block.super }}
-<script>
-function passwordCheck() {
-    if ($('#id_password').length != 1) {
-        return
-    }
-    var el = $('#id_password_rules'),
-        idPassword = $('#id_password'),
-        idPopover = $('#popover777'),
-        container = $('#container'),
-        progress = $('#id_progress'),
-        password_check_rules = {{ password_check_rules|safe }},
-        minLength = 6,
-        top = idPassword.offset().top - $('.navbar').outerHeight(true) - $('.page-heading').outerHeight(true) - 10 + 34,
-        left = 377,
-        i18n_fallback = {
-            "veryWeak": "{% trans 'Very weak' %}",
-            "weak": "{% trans 'Weak' %}",
-            "normal": "{% trans 'Normal' %}",
-            "medium": "{% trans 'Medium' %}",
-            "strong": "{% trans 'Strong' %}",
-            "veryStrong": "{% trans 'Very strong' %}"
-        };
-
-    $.each(password_check_rules, function (idx, rules) {
-        if(rules.key === 'id_security_password_min_length'){
-            minLength = rules.value
-        }
-    });
-
-    // 初始化popover
-    initPopover(container, progress, idPassword, el, password_check_rules, i18n_fallback);
-
-    // 监听事件
-    idPassword.on('focus', function () {
-        idPopover.css('top', top);
-        idPopover.css('left', left);
-        idPopover.css('display', 'block');
-    });
-    idPassword.on('blur', function () {
-        idPopover.css('display', 'none');
-    });
-    idPassword.on('keyup', function(){
-        var password = idPassword.val();
-        checkPasswordRules(password, minLength);
-    });
-}
-$(document).ready(function(){
-    passwordCheck();
-
-    var origin_password_text = $("#password_help_text").text();
-    var new_password_text = origin_password_text.replace('{}', "{{ object.source_display }}");
-    $("#password_help_text").html(new_password_text);
-
-    var origin_ssh_key_text = $("#ssh_key_help_text").text();
-    var new_ssh_key_text = origin_ssh_key_text.replace('{}', "{{ object.source_display }}");
-    $("#ssh_key_help_text").html(new_ssh_key_text)
-
-})
-.on("submit", "form", function (evt) {
-    evt.preventDefault();
-    var the_url = '{% url 'api-users:user-detail' pk=object.id %}';
-    var redirect_to = '{% url "users:user-list" %}';
-    var method = "PUT";
-    var form = $("form");
-    var data = form.serializeObject();
-    objectAttrsIsList(data, ['groups']);
-    objectAttrsIsDatetime(data,['date_expired']);
-    var props = {
-        url: the_url,
-        data: data,
-        method: method,
-        form: form,
-        redirect_to: redirect_to
-     };
-    formSubmit(props);
-})
-</script>
-{% endblock %}