diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 29276bcac6..85f26c51b4 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -88,13 +88,14 @@ tabs:
             - 2         # Name
             - 3         # Group
             - 4         # Auth driver
-            - 5         # VMs
-            - 6         # Memory
-            - 7         # CPU
-            #- 8         # Group ID
-            #- 9         # Hidden User Data
-            #- 10        # Labels
-            #- 11        # Search data
+            #- 5         # Password
+            - 6         # VMs
+            - 7         # Memory
+            - 8         # CPU
+            #- 9         # Group ID
+            #- 10        # Hidden User Data
+            #- 11        # Labels
+            #- 12        # Search data
         actions:
             User.refresh: true
             User.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index c9ba612c63..17411fdb4c 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -86,13 +86,14 @@ tabs:
             - 2         # Name
             - 3         # Group
             - 4         # Auth driver
-            - 5         # VMs
-            - 6         # Memory
-            - 7         # CPU
-            #- 8         # Group ID
-            #- 9         # Hidden User Data
-            #- 10        # Labels
-            #- 11        # Search data
+            #- 5         # Password
+            - 6         # VMs
+            - 7         # Memory
+            - 8         # CPU
+            #- 9         # Group ID
+            #- 10        # Hidden User Data
+            #- 11        # Labels
+            #- 12        # Search data
         actions:
             User.refresh: true
             User.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/groupadmin.yaml b/src/sunstone/etc/sunstone-views/groupadmin.yaml
index 4602c19977..33488bddd0 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin.yaml
@@ -86,13 +86,14 @@ tabs:
             - 2         # Name
             #- 3         # Group
             #- 4         # Auth driver
-            - 5         # VMs
-            - 6         # Memory
-            - 7         # CPU
-            #- 8         # Group ID
-            #- 9         # Hidden User Data
-            #- 10        # Labels
-            #- 11        # Search data
+            #- 5         # Password
+            - 6         # VMs
+            - 7         # Memory
+            - 8         # CPU
+            #- 9         # Group ID
+            #- 10        # Hidden User Data
+            #- 11        # Labels
+            #- 12        # Search data
         actions:
             User.refresh: true
             User.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
index b2a7855416..30c082ba90 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
@@ -86,13 +86,14 @@ tabs:
             - 2         # Name
             #- 3         # Group
             #- 4         # Auth driver
-            - 5         # VMs
-            - 6         # Memory
-            - 7         # CPU
-            #- 8         # Group ID
-            #- 9         # Hidden User Data
-            #- 10        # Labels
-            #- 11        # Search data
+            #- 5         # Password
+            - 6         # VMs
+            - 7         # Memory
+            - 8         # CPU
+            #- 9         # Group ID
+            #- 10        # Hidden User Data
+            #- 11        # Labels
+            #- 12        # Search data
         actions:
             User.refresh: true
             User.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 82b9814ad0..e4b4426ba7 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -85,13 +85,14 @@ tabs:
             - 2         # Name
             - 3         # Group
             - 4         # Auth driver
-            - 5         # VMs
-            - 6         # Memory
-            - 7         # CPU
-            #- 8         # Group ID
-            #- 9         # Hidden User Data
-            #- 10        # Labels
-            #- 11        # Search data
+            #- 5         # Password
+            - 6         # VMs
+            - 7         # Memory
+            - 8         # CPU
+            #- 9         # Group ID
+            #- 10        # Hidden User Data
+            #- 11        # Labels
+            #- 12        # Search data
         actions:
             User.refresh: true
             User.create_dialog: true
diff --git a/src/sunstone/public/app/tabs/users-tab/datatable.js b/src/sunstone/public/app/tabs/users-tab/datatable.js
index 2ddefb5c07..48a0246622 100644
--- a/src/sunstone/public/app/tabs/users-tab/datatable.js
+++ b/src/sunstone/public/app/tabs/users-tab/datatable.js
@@ -35,8 +35,8 @@ define(function(require) {
   var RESOURCE = "User";
   var XML_ROOT = "USER";
   var TAB_NAME = require('./tabId');
-  var LABELS_COLUMN = 10;
-  var SEARCH_COLUMN = 11;
+  var LABELS_COLUMN = 11;
+  var SEARCH_COLUMN = 12;
   var TEMPLATE_ATTR = 'TEMPLATE';
 
   /*
@@ -56,9 +56,9 @@ define(function(require) {
       "bSortClasses" : false,
       "bDeferRender": true,
       "aoColumnDefs": [
-          { "bSortable": false, "aTargets": ["check",5,6,7] },
+          { "bSortable": false, "aTargets": ["check",6,7,8] },
           {"sWidth": "35px", "aTargets": [0]},
-          { "sWidth": "150px", "aTargets": [5,6,7] },
+          { "sWidth": "150px", "aTargets": [6,7,8] },
           {"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)},
           {"bVisible": false, "aTargets": ['_all']}
       ]
@@ -69,6 +69,7 @@ define(function(require) {
       Locale.tr("Name"),
       Locale.tr("Group"),
       Locale.tr("Auth driver"),
+      Locale.tr("Password"),
       Locale.tr("VMs"),
       Locale.tr("Memory"),
       Locale.tr("CPU"),
@@ -155,6 +156,7 @@ define(function(require) {
       element.NAME,
       element.GNAME,
       element.AUTH_DRIVER,
+      element.PASSWORD,
       vms,
       memory,
       cpu,