diff --git a/modules/login.py b/modules/login.py
index 221a76778fa8dccf344ec6aa8d0368251eb83107..7aa6f33c14b8e4271449280e3e3ff2a234879b7c 100644
--- a/modules/login.py
+++ b/modules/login.py
@@ -67,13 +67,12 @@ def get_user_from_token(user):
         "data": user #sends back all information about user except password
     })
     
-@login_route.route("/api/get-user-public", methods=["POST"])
+@login_route.route("/api/get-user-public", methods=["POST"]) 
 def get_user_from_id():
     req = request.get_json()
     user_id = req.get("user_id")
     user = db.User.objecs.with_id(user_id)
     del user.password
-    del user.username
     del user.page_list
     del user.role
     return jsonify({
diff --git a/modules/page.py b/modules/page.py
index 4650bc5379d379bef8c129909511b1c248285352..f9323c55ac3f267734dd102239932d85e896f5e3 100644
--- a/modules/page.py
+++ b/modules/page.py
@@ -39,7 +39,12 @@ def get_page():
             if return_admin:
                 admins = db.User.objects(page_list__in = [vdata.id])
                 if len(admins) > 0:
-                    resp["admin"] = admins[0]
+                    admin = admins[0]
+                    del admin.password
+                    del admin.page_list
+                    resp["admin"] = admin
+                else:
+                    resp["admin"] = None
 
             return jsonify(resp)
         else: