diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index b9999f795f..ce2f52d623 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -139,6 +139,7 @@ tabs:
             - 9       # IPs
             #- 10      # Start Time
             - 11      # VNC
+            #- 12      # Hidden Template
         actions:
             VM.refresh: true
             VM.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index a79973bdce..52b09bd947 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -138,6 +138,7 @@ tabs:
             - 9       # IPs
             #- 10      # Start Time
             - 11      # VNC
+            #- 12      # Hidden Template
         actions:
             VM.refresh: true
             VM.create_dialog: true
diff --git a/src/sunstone/etc/sunstone-views/vcenter.yaml b/src/sunstone/etc/sunstone-views/vcenter.yaml
index 70b8446020..6e7fe837b0 100644
--- a/src/sunstone/etc/sunstone-views/vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/vcenter.yaml
@@ -139,6 +139,7 @@ tabs:
             - 9       # IPs
             #- 10      # Start Time
             - 11      # VNC
+            #- 12      # Hidden Template
         actions:
             VM.refresh: true
             VM.create_dialog: true
diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index c9ddb7e0f8..8b95a8085b 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -464,17 +464,7 @@ function userElementArray(user_json){
     }
 
     // Build hidden user template
-    var hidden_template = "";
-    for (var key in user.TEMPLATE){
-        switch (key){
-            // Don't copy unnecesary keys
-            case "SSH_PUBLIC_KEY":
-            case "TOKEN_PASSWORD":
-                break;
-            default:
-                hidden_template = hidden_template + key + "=" + user.TEMPLATE[key] + "\n";
-        }
-    }
+    var hidden_template = convert_template_to_string(user);
 
     return [
         '<input class="check_item" type="checkbox" id="user_'+user.ID+'" name="selected_items" value="'+user.ID+'"/>',
@@ -886,7 +876,7 @@ $(document).ready(function(){
       });
 
       $('#user_search').keyup(function(){
-        dataTable_users.fnFilter( $(this).val() );
+        dataTable_users.fnFilter( $(this).val(), null, true, false );
       })
 
       dataTable_users.on('draw', function(){
diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js
index 75a85c2070..64c9d44941 100644
--- a/src/sunstone/public/js/plugins/vms-tab.js
+++ b/src/sunstone/public/js/plugins/vms-tab.js
@@ -965,6 +965,7 @@ var vms_tab = {
             <th>'+tr("IPs")+'</th>\
             <th>'+tr("Start Time")+'</th>\
             <th>'+tr("")+'</th>\
+            <th>'+tr("Hidden Template")+'</th>\
           </tr>\
         </thead>\
         <tbody id="tbodyvmachines">\
@@ -1032,6 +1033,8 @@ function vMachineElementArray(vm_json){
         state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
     };
 
+    // Build hidden user template
+    var hidden_template = convert_template_to_string(vm);
 
     return [
         '<input class="check_item" type="checkbox" id="vm_'+vm.ID+'" name="selected_items" value="'+vm.ID+'"/>',
@@ -1045,7 +1048,8 @@ function vMachineElementArray(vm_json){
         hostname,
         ip_str(vm),
         str_start_time(vm),
-        vncIcon(vm)
+        vncIcon(vm),
+        hidden_template
     ];
 };
 
@@ -3388,7 +3392,7 @@ $(document).ready(function(){
       });
 
       $('#vms_search').keyup(function(){
-        dataTable_vMachines.fnFilter( $(this).val() );
+        dataTable_vMachines.fnFilter( $(this).val(), null, true, false );
       })
 
       dataTable_vMachines.on('draw', function(){