diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index 45485702648..4d16070890f 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -5,237 +5,265 @@
   cloudStack.sections.accounts = {
     title: 'Accounts',
     id: 'accounts',
-    listView: {
-      fields: {
-        name: { label: 'Name' },
-        accounttype: {
-          label: 'Role',
-          converter: function(args){
-            return cloudStack.converters.toRole(args);
-          }
-        },
-        domain: { label: 'Domain' },
-        state: { label: 'State' }
-      },
-
-      actions: {
-        add: {
-          label: 'Create account',
-
-          messages: {
-            confirm: function(args) {
-              return 'Are you sure you want to create an account?';
+    
+    sections: {
+      accounts: {        
+        listView: {
+          fields: {
+            name: { label: 'Name' },
+            accounttype: {
+              label: 'Role',
+              converter: function(args){
+                return cloudStack.converters.toRole(args);
+              }
             },
-            success: function(args) {
-              return 'Your new account is being created.';
-            },
-            notification: function(args) {
-              return 'Creating new account';
-            },
-            complete: function(args) {
-              return 'Account has been created successfully!';
-            }
+            domain: { label: 'Domain' },
+            state: { label: 'State' }
           },
 
-          createForm: {
-            title: 'Create account',
-            desc: 'Please fill in the following data to create a new account.',
-            preFilter: cloudStack.preFilter.createTemplate,
-            fields: {
-              username: {
-                label: 'Username',
-                validation: { required: true }
+          actions: {
+            add: {
+              label: 'Create account',
+
+              messages: {
+                confirm: function(args) {
+                  return 'Are you sure you want to create an account?';
+                },
+                success: function(args) {
+                  return 'Your new account is being created.';
+                },
+                notification: function(args) {
+                  return 'Creating new account';
+                },
+                complete: function(args) {
+                  return 'Account has been created successfully!';
+                }
               },
-              password: {
-                label: 'Password',
-                validation: { required: true },
-                isPassword: true
-              },
-              email: {
-                label: 'Email',
-                validation: { required: true }
-              },
-              firstname: {
-                label: 'First name',
-                validation: { required: true }
-              },
-              lastname: {
-                label: 'Last name',
-                validation: { required: true }
-              },
-              domainid: {
-                label: 'Domain',
-                validation: { required: true },
-                select: function(args) {
-                  $.ajax({
-                    url: createURL("listDomains"),
-                    dataType: "json",
-                    async: false,
-                    success: function(json) {
-                      var items = [];
-                      var domainObjs = json.listdomainsresponse.domain;
-                      $(domainObjs).each(function() {
-                        items.push({id: this.id, description: this.name});
+
+              createForm: {
+                title: 'Create account',
+                desc: 'Please fill in the following data to create a new account.',
+                preFilter: cloudStack.preFilter.createTemplate,
+                fields: {
+                  username: {
+                    label: 'Username',
+                    validation: { required: true }
+                  },
+                  password: {
+                    label: 'Password',
+                    validation: { required: true },
+                    isPassword: true
+                  },
+                  email: {
+                    label: 'Email',
+                    validation: { required: true }
+                  },
+                  firstname: {
+                    label: 'First name',
+                    validation: { required: true }
+                  },
+                  lastname: {
+                    label: 'Last name',
+                    validation: { required: true }
+                  },
+                  domainid: {
+                    label: 'Domain',
+                    validation: { required: true },
+                    select: function(args) {
+                      $.ajax({
+                        url: createURL("listDomains"),
+                        dataType: "json",
+                        async: false,
+                        success: function(json) {
+                          var items = [];
+                          var domainObjs = json.listdomainsresponse.domain;
+                          $(domainObjs).each(function() {
+                            items.push({id: this.id, description: this.name});
+                          });
+                          args.response.success({data: items});
+                        }
                       });
+                    }
+                  },
+                  account: {
+                    label: 'Account'
+                  },
+                  accounttype: {
+                    label: 'Account type',
+                    validation: { required: true },
+                    select: function(args) {
+                      var items = [];
+                      items.push({id:0, description: "User"});  //regular-user
+                      items.push({id:1, description: "Admin"}); //root-admin
                       args.response.success({data: items});
                     }
-                  });
+                  },
+                  timezone: {
+                    label: 'Timezone',
+                    select: function(args) {
+                      var items = [];
+                      items.push({id: "", description: ""});                  
+                      for(var p in timezoneMap)
+                        items.push({id: p, description: timezoneMap[p]});                  
+                      args.response.success({data: items});
+                    }
+                  }
                 }
               },
-              account: {
-                label: 'Account'
+
+              action: function(args) {
+                var array1 = [];
+                array1.push("&username=" + todb(args.data.username));
+
+                var password = args.data.password;
+                if (md5Hashed)
+                  password = $.md5(password);
+                array1.push("&password=" + password);
+
+                array1.push("&email=" + todb(args.data.email));
+                array1.push("&firstname=" + todb(args.data.firstname));
+                array1.push("&lastname=" + todb(args.data.lastname));
+
+                array1.push("&domainid=" + args.data.domainid);
+
+                var account = args.data.account;
+                if(account == null || account.length == 0)
+                  account = args.data.username;
+                array1.push("&account=" + todb(account));
+
+                var accountType = args.data.accounttype;
+                if (args.data.accounttype == "1" && parseInt(args.data.domainid) != rootDomainId) //if account type is admin, but domain is not Root domain
+                  accountType = "2"; // Change accounttype from root-domain("1") to domain-admin("2")
+                array1.push("&accounttype=" + accountType);
+                
+                if(args.data.timezone != null && args.data.timezone.length > 0)
+                  array1.push("&timezone=" + args.data.timezone);
+                
+                $.ajax({
+                  url: createURL("createAccount" + array1.join("")),
+                  dataType: "json",
+                  success: function(json) {
+                    var item = json.createaccountresponse.account;
+                    args.response.success({data:item});
+                  },
+                  error: function(XMLHttpResponse) {
+                    var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+                    args.response.error(errorMsg);
+                  }
+                });
               },
-              accounttype: {
-                label: 'Account type',
-                validation: { required: true },
-                select: function(args) {
-                  var items = [];
-                  items.push({id:0, description: "User"});  //regular-user
-                  items.push({id:1, description: "Admin"}); //root-admin
-                  args.response.success({data: items});
-                }
-              },
-              timezone: {
-                label: 'Timezone',
-                select: function(args) {
-                  var items = [];
-                  items.push({id: "", description: ""});                  
-                  for(var p in timezoneMap)
-                    items.push({id: p, description: timezoneMap[p]});                  
-                  args.response.success({data: items});
+
+              notification: {
+                poll: function(args) {
+                  args.complete();
                 }
               }
             }
           },
 
-          action: function(args) {
-            var array1 = [];
-            array1.push("&username=" + todb(args.data.username));
-
-            var password = args.data.password;
-            if (md5Hashed)
-              password = $.md5(password);
-            array1.push("&password=" + password);
-
-            array1.push("&email=" + todb(args.data.email));
-            array1.push("&firstname=" + todb(args.data.firstname));
-            array1.push("&lastname=" + todb(args.data.lastname));
-
-            array1.push("&domainid=" + args.data.domainid);
-
-            var account = args.data.account;
-            if(account == null || account.length == 0)
-              account = args.data.username;
-            array1.push("&account=" + todb(account));
-
-            var accountType = args.data.accounttype;
-            if (args.data.accounttype == "1" && parseInt(args.data.domainid) != rootDomainId) //if account type is admin, but domain is not Root domain
-              accountType = "2"; // Change accounttype from root-domain("1") to domain-admin("2")
-            array1.push("&accounttype=" + accountType);
-            
-            if(args.data.timezone != null && args.data.timezone.length > 0)
-              array1.push("&timezone=" + args.data.timezone);
-            
+          dataProvider: function(args) {
             $.ajax({
-              url: createURL("createAccount" + array1.join("")),
+              url: createURL("listAccounts&page=" + args.page + "&pagesize=" + pageSize),
               dataType: "json",
+              async: true,
               success: function(json) {
-                var item = json.createaccountresponse.account;
-                args.response.success({data:item});
-              },
-              error: function(XMLHttpResponse) {
-                var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
-                args.response.error(errorMsg);
+                var items = json.listaccountsresponse.account;
+                args.response.success({
+                  actionFilter: accountActionfilter,
+                  data:items
+                });
               }
             });
           },
 
-          notification: {
-            poll: function(args) {
-              args.complete();
-            }
-          }
-        }
-      },
+          detailView: {
+            name: 'Account details',
+            viewAll: { path: 'accounts.users', label: 'Users' },
+            
+            actions: {
 
-      dataProvider: function(args) {
-        $.ajax({
-          url: createURL("listAccounts&page=" + args.page + "&pagesize=" + pageSize),
-          dataType: "json",
-          async: true,
-          success: function(json) {
-            var items = json.listaccountsresponse.account;
-            args.response.success({
-              actionFilter: accountActionfilter,
-              data:items
-            });
-          }
-        });
-      },
+            },
 
-      detailView: {
-        name: 'Account details',
+            tabs: {
+              details: {
+                title: 'details',
 
-        actions: {
-
-        },
-
-        tabs: {
-          details: {
-            title: 'details',
-
-            fields: [
-              {
-                name: {
-                  label: 'Name',
-                  isEditable: true
-                }
-              },
-              {
-                id: { label: 'ID' },
-                accounttype: {
-                  label: 'Role',
-                  converter: function(args){
-                    return cloudStack.converters.toRole(args);
-                  }
-                },
-                domain: { label: 'Domain' },
-                state: { label: 'State' },
-                vmtotal: { label: 'Total of VM' },
-                iptotal: { label: 'Total of IP Address' },
-                receivedbytes: {
-                  label: 'Bytes received',
-                  converter: function(args) {
-                    if (args == null || args == 0)
-                      return "";
-                    else
-                      return cloudStack.converters.convertBytes(args);
-                  }
-                },
-                sentbytes: {
-                  label: 'Bytes sent',
-                  converter: function(args) {
-                    if (args == null || args == 0)
-                      return "";
-                    else
-                      return cloudStack.converters.convertBytes(args);
+                fields: [
+                  {
+                    name: {
+                      label: 'Name',
+                      isEditable: true
+                    }
+                  },
+                  {
+                    id: { label: 'ID' },
+                    accounttype: {
+                      label: 'Role',
+                      converter: function(args){
+                        return cloudStack.converters.toRole(args);
+                      }
+                    },
+                    domain: { label: 'Domain' },
+                    state: { label: 'State' },
+                    vmtotal: { label: 'Total of VM' },
+                    iptotal: { label: 'Total of IP Address' },
+                    receivedbytes: {
+                      label: 'Bytes received',
+                      converter: function(args) {
+                        if (args == null || args == 0)
+                          return "";
+                        else
+                          return cloudStack.converters.convertBytes(args);
+                      }
+                    },
+                    sentbytes: {
+                      label: 'Bytes sent',
+                      converter: function(args) {
+                        if (args == null || args == 0)
+                          return "";
+                        else
+                          return cloudStack.converters.convertBytes(args);
+                      }
+                    }
                   }
+                ],
+
+                dataProvider: function(args) {
+                  args.response.success(
+                    {
+                      actionFilter: accountActionfilter,
+                      data:args.context.accounts[0]
+                    }
+                  );
                 }
               }
-            ],
-
-            dataProvider: function(args) {
-              args.response.success(
-                {
-                  actionFilter: accountActionfilter,
-                  data:args.context.accounts[0]
-                }
-              );
             }
           }
+        }       
+      },         
+      users: {
+        type: 'select',
+        title: 'Users',
+        listView: {
+          id: 'users',
+          fields: {
+            username: { label: 'Username', editable: true },
+            firstname: { label: 'First name' },
+            lastname: { label: 'Last name' }
+          },          
+          dataProvider: function(args) {            
+            var acctObj = args.context.accounts[0];
+            $.ajax({
+              url: createURL("listUsers&domainid=" + fromdb(acctObj.domainid) + "&account=" + todb(fromdb(acctObj.name))),
+              dataType: "json",
+              success: function(json) {                
+                args.response.success({data: json.listusersresponse.user});                
+              }
+            })            
+          }
         }
-      }
-    }
+      }        
+    }    
   };
 
   var accountActionfilter = function(args) {