diff --git a/app/routers/dashboard.py b/app/routers/dashboard.py
index 84b0166..e121db1 100644
--- a/app/routers/dashboard.py
+++ b/app/routers/dashboard.py
@@ -1024,7 +1024,8 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list:
     if parent_id is None:
         rows = conn.execute(
             "SELECT id, title, parent_section, content_format, content, "
-            "is_shared, created_at, updated_at FROM pages "
+            "(is_shared OR share_mode != 'private' OR COALESCE(published,0)) as is_shared, "
+            "created_at, updated_at FROM pages "
             "WHERE parent_id IS NULL AND workspace_id=? AND deleted_at IS NULL "
             "ORDER BY created_at DESC",
             (ws_id,),
@@ -1032,7 +1033,8 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list:
     else:
         rows = conn.execute(
             "SELECT id, title, parent_section, content_format, content, "
-            "is_shared, created_at, updated_at FROM pages "
+            "(is_shared OR share_mode != 'private' OR COALESCE(published,0)) as is_shared, "
+            "created_at, updated_at FROM pages "
             "WHERE parent_id=? AND workspace_id=? AND deleted_at IS NULL "
             "ORDER BY created_at DESC",
             (parent_id, ws_id),
diff --git a/app/templates/_page_editor_content.html b/app/templates/_page_editor_content.html
index 1c57ccd..600d2d3 100644
--- a/app/templates/_page_editor_content.html
+++ b/app/templates/_page_editor_content.html
@@ -102,22 +102,24 @@
 
                     <!-- Participants list -->
                     <div class="sd-participants" x-show="accessList.length">
-                        <template x-for="a in accessList" :key="a.email">
+                        <template x-for="a in accessList" :key="a.id">
                             {% raw %}
                             <div class="sd-participant">
                                 <div class="sd-participant-info">
-                                    <div
-                                        class="sd-avatar"
-                                        x-text="a.email[0].toUpperCase()"
+                                    <div class="sd-avatar" x-show="a.user_avatar_url" style="overflow:hidden">
+                                        <img :src="a.user_avatar_url" style="width:100%;height:100%;border-radius:50%;object-fit:cover;" />
+                                    </div>
+                                    <div class="sd-avatar" x-show="!a.user_avatar_url"
+                                         x-text="(a.user_full_name || a.user_login || a.shared_with_email || '?')[0].toUpperCase()"
                                     ></div>
                                     <div>
                                         <div
                                             class="sd-participant-name"
-                                            x-text="a.email"
+                                            x-text="a.user_full_name || a.user_login || a.shared_with_email"
                                         ></div>
                                         <div
                                             class="sd-participant-email"
-                                            x-text="a.email"
+                                            x-text="a.shared_with_email || a.user_login || ''"
                                         ></div>
                                     </div>
                                 </div>
@@ -168,7 +170,7 @@
                                     <div class="sd-perm-sep"></div>
                                     <div
                                         class="sd-perm-option danger"
-                                        @click="removeAccess(a.email); a.permOpen=false"
+                                        @click="removeShare(a.id); a.permOpen=false"
                                     >
                                         Remove
                                     </div>