diff --git a/modules/page.py b/modules/page.py
index dbafce72816a88deb5a94f000e1584ffccbe6629..54895d828abdb85dabd81d87220a9043a30a5292 100644
--- a/modules/page.py
+++ b/modules/page.py
@@ -40,24 +40,29 @@ def get_page():
             }
 
             if return_admin:
-                admins = db.User.objects(page_list__in = [vdata.id])
-                if len(admins) > 0:
-                    admin = admins[0]
-                    del admin.password
-                    del admin.page_list
-                    vdata["admin"] = admin
-                else:
-                    vdata["admin"] = None  
-                                  
+                resp["admin_subdata"] = []
+                i = 0
                 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
-                        x["admin"] = admin
+                        print(admin)
+                        resp["admin_subdata"].append(admin)
                     else:
-                        x["admin"] = None
+                        resp["admin_subdata"].append(None)
+                    i += 1
+
+            if return_admin:
+                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)
         else: