diff --git a/modules/page.py b/modules/page.py
index 8db7f82d85331dade4defabb6be0c0f2513169c2..c9fcb419e7cb83fcffb15bb40bd2ba34ca80e951 100644
--- a/modules/page.py
+++ b/modules/page.py
@@ -11,13 +11,40 @@ page_route = Blueprint('page', __name__, template_folder="templates")
 @page_route.route("/api/page/get-top", methods=["POST"])
 def get_top_page():
     year = request.get_json().get("year")
+    return_admin = request.get_json().get("return_admin")
     try:
         vdata = db.VizData.objects.get(level = 0, year = year)
-        return jsonify({
+        subdata = [child for child in vdata.subdata]
+
+        resp = {
             "status":200,
             "data": vdata,
-            "subdata": [child for child in vdata.subdata]
-        })
+            "subdata": subdata
+        }
+
+        if return_admin:
+            resp["admin_subdata"] = []
+            for x in subdata:
+                admins = db.User.objects(page_list__in = [x.id])
+                if len(admins) > 0:
+                    admin = admins[0]
+                    del admin.password
+                    del admin.page_list
+                    print(admin)
+                    resp["admin_subdata"].append(admin)
+                else:
+                    resp["admin_subdata"].append(None)
+
+            admins = db.User.objects(page_list__in = [vdata.id])
+            if len(admins) > 0:
+                admin = admins[0]
+                del admin.password
+                del admin.page_list
+                resp["admin"] = admin
+            else:
+                resp["admin"] = None
+
+        return jsonify(resp)
     except Exception as e:
         return jsonify({
             "status": 500,
@@ -52,7 +79,6 @@ def get_page():
                     else:
                         resp["admin_subdata"].append(None)
 
-            if return_admin:
                 admins = db.User.objects(page_list__in = [vdata.id])
                 if len(admins) > 0:
                     admin = admins[0]