diff --git a/assets/javascripts/discourse/components/assign-user-form.js b/assets/javascripts/discourse/components/assign-user-form.js
index 70f602c..0eec2fe 100644
--- a/assets/javascripts/discourse/components/assign-user-form.js
+++ b/assets/javascripts/discourse/components/assign-user-form.js
@@ -18,6 +18,7 @@ export default class AssignUserForm extends Component {
 
     this.args.formApi.submit = this.assign;
     this.selectedTargetId = this.TOPIC_ID;
+    this.args.model.updatedPostAssignments = new Map();
   }
 
   get assignments() {
@@ -81,12 +82,20 @@ export default class AssignUserForm extends Component {
     this.assigneeName = name;
     this.assigneeError = false;
 
+    let username, groupName;
     if (this.taskActions.allowedGroupsForAssignment.includes(name)) {
-      this.args.model.username = null;
-      this.args.model.group_name = name;
+      username = null;
+      groupName = name;
     } else {
-      this.args.model.username = name;
-      this.args.model.group_name = null;
+      username = name;
+      groupName = null;
+    }
+
+    this.args.model.username = username;
+    this.args.model.group_name = groupName;
+
+    if (this.editingTopicAssignments) {
+      // fixme andrei implement
     }
   }
 
diff --git a/assets/javascripts/discourse/components/modal/assign-user.js b/assets/javascripts/discourse/components/modal/assign-user.js
index bb856bf..db79db5 100644
--- a/assets/javascripts/discourse/components/modal/assign-user.js
+++ b/assets/javascripts/discourse/components/modal/assign-user.js
@@ -32,6 +32,7 @@ export default class AssignUser extends Component {
 
   @action
   async onSubmit() {
+    console.log("this.model.updatedPostAssignments", this.model.updatedPostAssignments);
     this.args.closeModal();
     await this.taskActions.assign(this.model);
   }