diff --git a/assets/javascripts/discourse/components/assign-user-form.hbs b/assets/javascripts/discourse/components/assign-user-form.hbs
index fe3234c..c234f9c 100644
--- a/assets/javascripts/discourse/components/assign-user-form.hbs
+++ b/assets/javascripts/discourse/components/assign-user-form.hbs
@@ -2,8 +2,9 @@
   <div class="control-group">
     <label>{{i18n "discourse_assign.assign_modal.assignment_label"}}</label>
     <ComboBox
-      @value={{0}}
+      @value={{this.selectedTargetId}}
       @content={{this.assignments}}
+      @onChange={{this.synchronizeAssignee}}
     />
   </div>
 {{/if}}
diff --git a/assets/javascripts/discourse/components/assign-user-form.js b/assets/javascripts/discourse/components/assign-user-form.js
index de089a1..b89773d 100644
--- a/assets/javascripts/discourse/components/assign-user-form.js
+++ b/assets/javascripts/discourse/components/assign-user-form.js
@@ -11,15 +11,17 @@ export default class AssignUserForm extends Component {
   @tracked assigneeError = false;
   @tracked
   assigneeName = this.args.model.username || this.args.model.group_name;
+  TOPIC = 0;
 
   constructor() {
     super(...arguments);
 
     this.args.formApi.submit = this.assign;
+    this.selectedTargetId = this.TOPIC;
   }
 
   get assignments() {
-    const topicAssignment = { id: 0, name: "Topic" };
+    const topicAssignment = { id: this.TOPIC, name: "Topic" };
     return [topicAssignment, ...this.postAssignments];
   }
 
@@ -87,4 +89,16 @@ export default class AssignUserForm extends Component {
       this.args.model.group_name = null;
     }
   }
+
+  @action
+  synchronizeAssignee(selectedTargetId) {
+    console.log("selectedTargetId", selectedTargetId);
+    console.log("synchronizeAssignee...");
+    this.selectedTargetId = selectedTargetId;
+    if (selectedTargetId === this.TOPIC) {
+      this.assigneeName = "TOPIC";
+    } else {
+      this.assigneeName = "POST";
+    }
+  }
 }
diff --git a/assets/javascripts/discourse/services/task-actions.js b/assets/javascripts/discourse/services/task-actions.js
index 465d1ac..a7174c6 100644
--- a/assets/javascripts/discourse/services/task-actions.js
+++ b/assets/javascripts/discourse/services/task-actions.js
@@ -84,6 +84,7 @@ export default class TaskActions extends Service {
   }
 
   async assign(model) {
+    console.log("model", model);
     if (isEmpty(model.username)) {
       model.target.set("assigned_to_user", null);
     }