diff --git a/admin/src/graphql/communityStatistics.js b/admin/src/graphql/communityStatistics.js
index 868bfd02a..1b427dbbe 100644
--- a/admin/src/graphql/communityStatistics.js
+++ b/admin/src/graphql/communityStatistics.js
@@ -4,12 +4,14 @@ export const communityStatistics = gql`
   query {
     communityStatistics {
       totalUsers
-      activeUsers
       deletedUsers
       totalGradidoCreated
       totalGradidoDecayed
-      totalGradidoAvailable
-      totalGradidoUnbookedDecayed
+      totalAvailable {
+        activeUsers
+        totalGradidoAvailable
+        totalGradidoUnbookedDecayed
+      }
     }
   }
 `
diff --git a/admin/src/pages/CommunityStatistic.spec.js b/admin/src/pages/CommunityStatistic.spec.js
index 50e04d11f..f8bfa95e2 100644
--- a/admin/src/pages/CommunityStatistic.spec.js
+++ b/admin/src/pages/CommunityStatistic.spec.js
@@ -17,12 +17,14 @@ const defaultData = () => {
   return {
     communityStatistics: {
       totalUsers: 3113,
-      activeUsers: 1057,
       deletedUsers: 35,
       totalGradidoCreated: '4083774.05000000000000000000',
       totalGradidoDecayed: '-1062639.13634129622923372197',
-      totalGradidoAvailable: '2513565.869444365732411569',
-      totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
+      totalAvailable: {
+        activeUsers: 1057,
+        totalGradidoAvailable: '2513565.869444365732411569',
+        totalGradidoUnbookedDecayed: '-500474.6738366222166261272',
+      },
     },
   }
 }
diff --git a/admin/src/pages/CommunityStatistic.vue b/admin/src/pages/CommunityStatistic.vue
index 3b4865ee3..6858e77f6 100644
--- a/admin/src/pages/CommunityStatistic.vue
+++ b/admin/src/pages/CommunityStatistic.vue
@@ -31,7 +31,13 @@ export default {
         return communityStatistics
       },
       update({ communityStatistics }) {
-        this.statistics = communityStatistics
+        const totals = { ...communityStatistics.totalAvailable }
+        this.statistics = { ...communityStatistics, ...totals }
+        this.activeUsers = this.statistics.totalAvailable.activeUsers
+        this.totalGradidoAvailable = this.statistics.totalAvailable.totalGradidoAvailable
+        this.totalGradidoUnbookedDecayed =
+          this.statistics.totalAvailable.totalGradidoUnbookedDecayed
+        delete this.totalAvailable
       },
       error({ message }) {
         this.toastError(message)