diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 7014b0b972..890ef8083b 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -31,11 +31,12 @@ tabs:
             - users
             - network
         widgets_two_per_row:
+#            - user_quotas
+#            - group_quotas
         widgets_one_per_row:
             - vms
             - hosts
         widgets_one_footer:
-#            - quotas
     system-tab:
         panel_tabs:
         actions:
diff --git a/src/sunstone/etc/sunstone-views/cloud.yaml b/src/sunstone/etc/sunstone-views/cloud.yaml
index ff7bf8ef45..dba0fb8607 100644
--- a/src/sunstone/etc/sunstone-views/cloud.yaml
+++ b/src/sunstone/etc/sunstone-views/cloud.yaml
@@ -27,12 +27,14 @@ tabs:
         widgets_three_per_row:
             #- users
         widgets_two_per_row:
+#            - user_quotas
+#            - group_quotas
             #- network
             #- storage
             #- hosts
             #- vms
         widgets_one_per_row:
-            - vms
+#            - vms
     system-tab:
         panel_tabs:
         actions:
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index b532de7b7b..c7337b7e0a 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -30,12 +30,13 @@ tabs:
         widgets_two_per_row:
             - network
             - storage
+            - user_quotas
+            - group_quotas
             #- hosts
             #- vms
         widgets_one_per_row:
             - vms
         widgets_one_footer:
-            - quotas
     system-tab:
         panel_tabs:
         actions:
diff --git a/src/sunstone/etc/sunstone-views/vdcadmin.yaml b/src/sunstone/etc/sunstone-views/vdcadmin.yaml
index c6d8e815ed..39ea311d59 100644
--- a/src/sunstone/etc/sunstone-views/vdcadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/vdcadmin.yaml
@@ -30,12 +30,13 @@ tabs:
             - network
             - storage
         widgets_two_per_row:
+            - user_quotas
+            - group_quotas
             #- hosts
             #- vms
         widgets_one_per_row:
             - vms
         widgets_one_footer:
-            - quotas
     system-tab:
         panel_tabs:
         actions: