diff --git a/apps/assets/templates/assets/admin_user_create.html b/apps/assets/templates/assets/admin_user_create_update.html
similarity index 100%
rename from apps/assets/templates/assets/admin_user_create.html
rename to apps/assets/templates/assets/admin_user_create_update.html
diff --git a/apps/assets/templates/assets/admin_user_detail.html b/apps/assets/templates/assets/admin_user_detail.html
new file mode 100644
index 000000000..12a108f6c
--- /dev/null
+++ b/apps/assets/templates/assets/admin_user_detail.html
@@ -0,0 +1,220 @@
+{% extends 'base.html' %}
+{% load common_tags %}
+{% load users_tags %}
+{% load static %}
+{% load i18n %}
+
+{% block custom_head_css_js %}
+    <link href="{% static "css/plugins/select2/select2.min.css" %}" rel="stylesheet">
+    <script src="{% static "js/plugins/select2/select2.full.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 'Detail' %} </a>
+                            </li>
+                            <li><a href="" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Associate assets' %}</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>{{ admin_user.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">
+                                            <li><a href="#"></a>
+                                            </li>
+                                            <li><a href="#"></a>
+                                            </li>
+                                        </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>{% trans 'Name' %}:</td>
+                                            <td><b>{{ admin_user.name }}</b></td>
+                                        </tr>
+                                        <tr>
+                                            <td>{% trans 'Username' %}:</td>
+                                            <td><b>{{ admin_user.username }}</b></td>
+                                        </tr>
+                                        <tr>
+                                            <td>{% trans 'Date created' %}:</td>
+                                            <td><b>{{ admin_user.date_created }}</b></td>
+                                        </tr>
+                                        <tr>
+                                            <td>{% trans 'Created by' %}:</td>
+                                            <td><b>{{ asset_group.created_by  }}</b></td>
+                                        </tr>
+                                        <tr>
+                                            <td>{% trans 'Comment' %}:</td>
+                                            <td><b>{{ admin_user.comment }}</b></td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+
+                            <div class="ibox float-e-margins">
+                                <div class="ibox-title">
+                                    <span style="float: left">{% trans 'Asset list of ' %} <b>{{ admin_user.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">
+                                            <li><a href="#"></a>
+                                            </li>
+                                            <li><a href="#"></a>
+                                            </li>
+                                        </ul>
+                                        <a class="close-link">
+                                            <i class="fa fa-times"></i>
+                                        </a>
+                                    </div>
+                                </div>
+                                <div class="ibox-content">
+                                    <table class="table table-hover">
+                                        <thead>
+                                            <tr>
+                                                <th>{% trans 'Hostname' %}</th>
+                                                <th>{% trans 'IP' %}</th>
+                                                <th>{% trans 'Port' %}</th>
+                                                <th>{% trans 'Alive' %}</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            {% for asset in page_obj %}
+                                            <tr>
+                                                <td>{{ asset.hostname }}</td>
+                                                <td>{{ asset.ip }}</td>
+                                                <td>{{ asset.port }}</td>
+                                                <td>Alive</td>
+                                            </tr>
+                                            {% endfor %}
+                                        </tbody>
+                                    </table>
+                                    <div class="row">
+                                        {% include '_pagination.html' %}
+                                    </div>
+                                </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 'Quick update' %}
+                                </div>
+                                <div class="panel-body">
+                                    <table class="table">
+                                        <tbody>
+                                        <tr class="no-borders-tr">
+                                            <td width="50%">{% trans 'Get install script' %}:</td>
+                                            <td>
+                                                <span style="float: right">
+                                                    <button type="button" class="btn btn-primary btn-xs" style="width: 54px">{% trans 'Get' %}</button>
+                                                </span>
+                                            </td>
+                                        </tr>
+
+                                        <tr>
+                                            <td width="50%">{% trans 'Retest asset connectivity' %}:</td>
+                                            <td>
+                                                <span style="float: right">
+                                                    <button type="button" class="btn btn-primary btn-xs" style="width: 54px">{% trans 'Start' %}</button>
+                                                </span>
+                                            </td>
+                                        </tr>
+
+                                        <tr>
+                                            <td width="50%">{% trans 'Reset private key' %}:</td>
+                                            <td>
+                                                <span style="float: right">
+                                                    <button type="button" class="btn btn-primary btn-xs" style="width: 54px">{% trans 'Reset' %}</button>
+                                                </span>
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+
+                            <div class="panel panel-info">
+                                <div class="panel-heading">
+                                    <i class="fa fa-info-circle"></i> {% trans 'Replace asset admin user with this' %}
+                                </div>
+                                <div class="panel-body">
+                                    <table class="table">
+                                        <tbody>
+                                        <form>
+                                            <tr class="no-borders-tr">
+                                                <td colspan="2">
+                                                    <select data-placeholder="{% trans 'Select asset' %}" class="select2" style="width: 100%" multiple="" tabindex="4">
+                                                        {% for group in groups %}
+                                                            <option value="{{ group.id }}">{{ group.name }}</option>
+                                                        {% endfor %}
+                                                    </select>
+                                                </td>
+                                            </tr>
+                                            <tr class="no-borders-tr">
+                                                <td colspan="2">
+                                                    <button type="button" class="btn btn-info btn-sm">{% trans 'Replace' %}</button>
+                                                </td>
+                                            </tr>
+                                        </form>
+                                        </tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    </div>
+
+{% endblock %}
+{% block custom_foot_js %}
+    <script>
+{#        function switch_user_status(obj) {#}
+{#            var status = $(obj).prop('checked');#}
+{##}
+{#            $.ajax({#}
+{#                url: "{% url 'users:user-active-api' pk=user.id %}",#}
+{#                type: "PUT",#}
+{#                data: {#}
+{#                    'is_active': status#}
+{#                },#}
+{#                success: function (data, status) {#}
+{#                    console.log(data)#}
+{#                },#}
+{#                error: function () {#}
+{#                    console.log('error')#}
+{#                }#}
+{#            })#}
+{#        }#}
+        $(document).ready(function () {
+            $('.select2').select2();
+        });
+    </script>
+{% endblock %}
\ No newline at end of file
diff --git a/apps/assets/templates/assets/admin_user_list.html b/apps/assets/templates/assets/admin_user_list.html
index d7aae75aa..eeb4587bd 100644
--- a/apps/assets/templates/assets/admin_user_list.html
+++ b/apps/assets/templates/assets/admin_user_list.html
@@ -20,7 +20,7 @@
          <tr class="gradeX">
              <td class="text-center">{{ admin_user.id }}</td>
              <td>
-                 <a href="{% url 'users:user-detail' pk=user.id %}">
+                 <a href="{% url 'assets:admin-user-detail' pk=admin_user.id %}">
                      {{ admin_user.name }}
                  </a>
              </td>
diff --git a/apps/assets/templates/assets/asset_group_detail.html b/apps/assets/templates/assets/asset_group_detail.html
index 08272a04f..4c48867b9 100644
--- a/apps/assets/templates/assets/asset_group_detail.html
+++ b/apps/assets/templates/assets/asset_group_detail.html
@@ -69,7 +69,7 @@
 
                             <div class="ibox float-e-margins">
                                 <div class="ibox-title">
-                                    <span>{% trans 'Asset list of ' %} <b>{{ asset_group.name }}</b></span>
+                                    <span style="float: left"></span>{% trans 'Asset list of ' %} <b>{{ asset_group.name }}</b></span>
                                     <div class="ibox-tools">
                                         <a class="collapse-link">
                                             <i class="fa fa-chevron-up"></i>
@@ -118,7 +118,7 @@
                         <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 'Associate asset user(system/admin)' %}
+                                    <i class="fa fa-info-circle"></i> {% trans 'Associate system user' %}
                                 </div>
                                 <div class="panel-body">
                                     <table class="table">
@@ -207,23 +207,23 @@
 {% endblock %}
 {% block custom_foot_js %}
     <script>
-        function switch_user_status(obj) {
-            var status = $(obj).prop('checked');
-
-            $.ajax({
-                url: "{% url 'users:user-active-api' pk=user.id %}",
-                type: "PUT",
-                data: {
-                    'is_active': status
-                },
-                success: function (data, status) {
-                    console.log(data)
-                },
-                error: function () {
-                    console.log('error')
-                }
-            })
-        }
+{#        function switch_user_status(obj) {#}
+{#            var status = $(obj).prop('checked');#}
+{##}
+{#            $.ajax({#}
+{#                url: "{% url 'users:user-active-api' pk=user.id %}",#}
+{#                type: "PUT",#}
+{#                data: {#}
+{#                    'is_active': status#}
+{#                },#}
+{#                success: function (data, status) {#}
+{#                    console.log(data)#}
+{#                },#}
+{#                error: function () {#}
+{#                    console.log('error')#}
+{#                }#}
+{#            })#}
+{#        }#}
         $(document).ready(function () {
             $('.select2').select2();
         })
diff --git a/apps/assets/views.py b/apps/assets/views.py
index 0ef1c0a4f..06cec83d2 100644
--- a/apps/assets/views.py
+++ b/apps/assets/views.py
@@ -213,7 +213,7 @@ class AdminUserListView(AdminUserRequiredMixin, ListView):
         return super(AdminUserListView, self).get_context_data(**kwargs)
 
     def get_queryset(self):
-        # Todo: Default group by lose asset connection num
+        # Todo: Default order by lose asset connection num
         self.queryset = super(AdminUserListView, self).get_queryset()
         self.keyword = keyword = self.request.GET.get('keyword', '')
         self.sort = sort = self.request.GET.get('sort', '-date_created')
@@ -230,7 +230,7 @@ class AdminUserListView(AdminUserRequiredMixin, ListView):
 class AdminUserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateView):
     model = AdminUser
     form_class = AdminUserForm
-    template_name = 'assets/admin_user_create.html'
+    template_name = 'assets/admin_user_create_update.html'
     success_url = reverse_lazy('assets:admin-user-list')
     success_message = _('Create admin user <a href="%s">%s</a> successfully.')
 
@@ -250,12 +250,46 @@ class AdminUserCreateView(AdminUserRequiredMixin, SuccessMessageMixin, CreateVie
 
 
 class AdminUserUpdateView(AdminUserRequiredMixin, UpdateView):
-    pass
+    model = AdminUser
+    form_class = AdminUserForm
+    template_name = 'assets/admin_user_create_update.html'
+    success_message = _('Update admin user <a href="%s">%s</a> successfully.')
+
+    def get_context_data(self, **kwargs):
+        context = {
+            'app': 'assets',
+            'action': 'Update admin user'
+        }
+        kwargs.update(context)
+        return super(AdminUserUpdateView, self).get_context_data(**kwargs)
+
+    def get_success_url(self):
+        success_url = reverse_lazy('assets:admin-user-detail', pk=self.object.pk)
+        return success_url
 
 
-class AdminUserDetailView(AdminUserRequiredMixin, DetailView):
-    pass
+class AdminUserDetailView(AdminUserRequiredMixin, SingleObjectMixin, ListView):
+    paginate_by = settings.CONFIG.DISPLAY_PER_PAGE
+    template_name = 'assets/admin_user_detail.html'
+    context_object_name = 'admin_user'
+
+    def get(self, request, *args, **kwargs):
+        self.object  = self.get_object(queryset=AdminUser.objects.all())
+        return super(AdminUserDetailView, self).get(request, *args, **kwargs)
+
+    def get_queryset(self):
+        return self.object.assets.all()
+
+    def get_context_data(self, **kwargs):
+        context = {
+            'app': 'assets',
+            'action': 'Admin user detail'
+        }
+        kwargs.update(context)
+        return super(AdminUserDetailView, self).get_context_data(**kwargs)
 
 
 class AdminUserDeleteView(AdminUserRequiredMixin, DeleteView):
-    pass
+    model = AdminUser
+    template_name = 'assets/delete_confirm.html'
+    success_url = 'assets:admin-user-list'
diff --git a/apps/users/templates/users/user_detail.html b/apps/users/templates/users/user_detail.html
index 19d50061b..ae61ddf9a 100644
--- a/apps/users/templates/users/user_detail.html
+++ b/apps/users/templates/users/user_detail.html
@@ -108,7 +108,7 @@
                         <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 'Quick modify' %}
+                                    <i class="fa fa-info-circle"></i> {% trans 'Quick update' %}
                                 </div>
                                 <div class="panel-body">
                                     <table class="table">
@@ -191,7 +191,7 @@
                                         <tr>
                                           <td ><b class="bdg_user_group" data-gid={{ group.id }}>{{ group.name }}</b></td>
                                           <td>
-                                              <button class="btn btn-danger btn-sm btn_delete_user_group" type="button" style="float: right;"><i class="fa fa-minus"></i></button>
+                                              <button class="btn btn-danger btn-xs btn_delete_user_group" type="button" style="float: right;"><i class="fa fa-minus"></i></button>
                                           </td>
                                         </tr>
                                         {% endfor %}
diff --git a/apps/users/urls.py b/apps/users/urls.py
index a89958a2a..e31071c11 100644
--- a/apps/users/urls.py
+++ b/apps/users/urls.py
@@ -16,7 +16,6 @@ urlpatterns = [
         name='reset-password-success'),
     url(r'^user$', views.UserListView.as_view(), name='user-list'),
     url(r'^user/(?P<pk>[0-9]+)$', views.UserDetailView.as_view(), name='user-detail'),
-    url(r'^user/(?P<pk>[0-9]+)/assets-perm$', views.UserDetailView.as_view(), name='user-detail'),
     url(r'^user/create$', views.UserCreateView.as_view(), name='user-create'),
     url(r'^user/(?P<pk>[0-9]+)/update$', views.UserUpdateView.as_view(), name='user-update'),
     url(r'^user/(?P<pk>[0-9]+)/delete$', views.UserDeleteView.as_view(), name='user-delete'),