diff --git a/src/sunstone/public/app/utils/panel/permissions-table.js b/src/sunstone/public/app/utils/panel/permissions-table.js
index 8e2d881fec..ab9a621022 100644
--- a/src/sunstone/public/app/utils/panel/permissions-table.js
+++ b/src/sunstone/public/app/utils/panel/permissions-table.js
@@ -3,7 +3,7 @@ define(function(require) {
     This module insert a row with the name of the resource.
     The row can be edited and a rename action will be sent
    */
-  
+
   var TemplatePermissionsTable = require('hbs!./permissions-table/html');
   var TemplatePermissions = require('hbs!./permissions-table/permissions');
   var TemplateOwner = require('hbs!./permissions-table/owner');
@@ -25,17 +25,17 @@ define(function(require) {
       permissionsHTML = TemplatePermissions({'element': element})
     }
 
-    // TODO: bug? if action is not enabled the edit button should be hidden,
-    // but the group/owner info should still be visible
-    var ownerHTML = '';
-    if (Config.isTabActionEnabled(tabName, resourceType + '.chown')) {
-      ownerHTML = TemplateOwner({'element': element});
-    }
+    var ownerHTML = TemplateOwner({
+      'tabName': tabName,
+      'action': resourceType + '.chown',
+      'element': element
+    });
 
-    var groupHTML = '';
-    if (Config.isTabActionEnabled(tabName, resourceType + '.chgrp')) {
-      groupHTML = TemplateGroup({'element': element})
-    }
+    var groupHTML = TemplateGroup({
+      'tabName': tabName,
+      'action': resourceType + '.chgrp',
+      'element': element
+    })
 
     var permissionsTableHTML = TemplatePermissionsTable({
       'resourceType': resourceType.toLowerCase(),
diff --git a/src/sunstone/public/app/utils/panel/permissions-table/group.hbs b/src/sunstone/public/app/utils/panel/permissions-table/group.hbs
index 126403fe35..4e97938d42 100644
--- a/src/sunstone/public/app/utils/panel/permissions-table/group.hbs
+++ b/src/sunstone/public/app/utils/panel/permissions-table/group.hbs
@@ -2,8 +2,10 @@
   <td class="key_td">{{tr "Group"}}</td>
   <td colspan="2" id="value_td_group">{{element.GNAME}}</td>
   <td>
+    {{#isTabActionEnabled tabName action}}
     <div id="div_edit_chg_group">
       <a id="div_edit_chg_group_link" class="edit_e" href="#"> <i class="fa fa-pencil-square-o right"/></a>
     </div>
+    {{/isTabActionEnabled}}
   </td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/src/sunstone/public/app/utils/panel/permissions-table/owner.hbs b/src/sunstone/public/app/utils/panel/permissions-table/owner.hbs
index e678a0bca1..fe4348dc87 100644
--- a/src/sunstone/public/app/utils/panel/permissions-table/owner.hbs
+++ b/src/sunstone/public/app/utils/panel/permissions-table/owner.hbs
@@ -2,8 +2,10 @@
   <td class="key_td">{{tr "Owner"}}</td>
   <td colspan="2" id="value_td_owner">{{element.UNAME}}</td>
   <td>
+    {{#isTabActionEnabled tabName action}}
     <div id="div_edit_chg_owner">
       <a id="div_edit_chg_owner_link" class="edit_e" href="#"> <i class="fa fa-pencil-square-o right"/></a>
     </div>
+    {{/isTabActionEnabled}}
   </td>
-</tr>
\ No newline at end of file
+</tr>