diff --git a/assets/javascripts/discourse/components/modal/edit-topic-assignments.js b/assets/javascripts/discourse/components/modal/edit-topic-assignments.js
index eae6f98..14bec74 100644
--- a/assets/javascripts/discourse/components/modal/edit-topic-assignments.js
+++ b/assets/javascripts/discourse/components/modal/edit-topic-assignments.js
@@ -13,12 +13,23 @@ export default class EditTopicAssignments extends Component {
     super(...arguments);
     const topicAssignment = {
       type: "Topic",
-      username: "",
-      group_name: "",
-      status: "",
-      note: ""
+      username: this.topic.assigned_to_user?.username,
+      group_name: this.topic.assigned_to_group?.name,
+      status: this.topic.assignment_status,
+      note: this.topic.assignment_note
     };
     this.assignments.push(topicAssignment);
+
+    this.topic.assignedPosts().forEach((a) => {
+      this.assignments.push({
+        type: "Post",
+        post_number: a.post_number,
+        username: a.username,
+        group_name: a.name,
+        status: a.assignment_status,
+        note: a.assignment_note,
+      });
+    });
   }
 
   get title() {
diff --git a/assets/javascripts/discourse/components/topic-assignments.js b/assets/javascripts/discourse/components/topic-assignments.js
index 881147a..b6db4e1 100644
--- a/assets/javascripts/discourse/components/topic-assignments.js
+++ b/assets/javascripts/discourse/components/topic-assignments.js
@@ -24,7 +24,10 @@ export default class TopicAssignments extends Component {
     if (assignment.type === "Topic") {
       return { id: this.TOPIC_ID, name: "Topic" };
     } else {
-      return null;
+      return {
+        id: assignment.post_number,
+        name: `Post #${assignment.post_number}`, // fixme andrei string
+      };
     }
   }
 }
diff --git a/assets/javascripts/discourse/initializers/extend-for-assigns.js b/assets/javascripts/discourse/initializers/extend-for-assigns.js
index e8c77d1..010a5a8 100644
--- a/assets/javascripts/discourse/initializers/extend-for-assigns.js
+++ b/assets/javascripts/discourse/initializers/extend-for-assigns.js
@@ -61,6 +61,7 @@ function extendTopicModel(api) {
       return [...map.values()];
     },
 
+    // fixme andrei rename to postAssignment()
     assignedPosts() {
       if (!this.indirectly_assigned_to) {
         return [];