diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index 543da2c588..2bc4e8ac40 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -742,6 +742,11 @@ $(document).ready(function(){
     setupUpdatePasswordDialog();
     setupUserQuotasDialog();
     setUserAutorefresh();
+    //Setup quota icons
+    //Also for group tab
+    setupQuotaIcons();
+
+
 
     initCheckAllBoxes(dataTable_users);
     tableCheckboxesListener(dataTable_users);
diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js
index dbdb401bf7..636c21e4e4 100644
--- a/src/sunstone/public/js/sunstone-util.js
+++ b/src/sunstone/public/js/sunstone-util.js
@@ -1067,11 +1067,6 @@ function setupQuotaIcons(){
         $(this).parents('li').fadeOut(function(){$(this).remove()});
         return false;
     });
-
-    $('.quota_remove_icon').live('click',function(){
-        $(this).parents('li').fadeOut(function(){$(this).remove()});
-        return false;
-    });
 }
 
 function parseQuotas(elem){
@@ -1155,6 +1150,6 @@ function quotaListItem(quota_json){
                'Leases: ' + quota_json.LEASES +  (quota_json.LEASES_USED ? ' (' + quota_json.LEASES_USED + '). ': ". ");
         break;
     }
-    str += '<i class="quota_edit_icon icon-pencil"></i> <i class="quota_remove_icon icon-remove"></i></pre></li>';
+    str += '<i class="quota_edit_icon icon-pencil"></i></pre></li>';
     return str;
 }
\ No newline at end of file
diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index ae10d40f8d..f0a4fd2866 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -309,11 +309,6 @@ $(document).ready(function(){
     //This dialog is shared to update templates
     setupTemplateUpdateDialog();
 
-    //Setup quota icons
-    //Live listeners not working when being added in specific
-    //context of users/groups dialog. Adding them globally then.
-    setupQuotaIcons();
-
     //Listen for .action_buttons
     //An action buttons runs a predefined action. If it has type
     //"multiple" it runs that action on the elements of a datatable.