diff --git a/assets/javascripts/discourse/components/assign-user-form.hbs b/assets/javascripts/discourse/components/assign-user-form.hbs
index 0593c67..b24c472 100644
--- a/assets/javascripts/discourse/components/assign-user-form.hbs
+++ b/assets/javascripts/discourse/components/assign-user-form.hbs
@@ -1,6 +1,4 @@
 <Assignment
   @model={{@model}}
-  @note={{@model.note}}
-  @status={{@model.status}}
   @onSubmit={{this.assign}}
-  @showValidationErrors={{this.showValidationErrors}}/>
+  @showValidationErrors={{this.showValidationErrors}} />
diff --git a/assets/javascripts/discourse/components/assignment.hbs b/assets/javascripts/discourse/components/assignment.hbs
index 504a423..f0ab145 100644
--- a/assets/javascripts/discourse/components/assignment.hbs
+++ b/assets/javascripts/discourse/components/assignment.hbs
@@ -36,7 +36,7 @@
       @id="assign-status"
       @content={{this.assignStatusOptions}}
       @value={{this.status}}
-      @onChange={{fn (mut @status)}}
+      @onChange={{fn (mut @model.status)}}
     />
   </div>
 {{/if}}
@@ -49,7 +49,7 @@
 
   <Textarea
     id="assign-modal-note"
-    @value={{@note}}
+    @value={{@model.note}}
     {{on "keydown" this.handleTextAreaKeydown}}
   />
 </div>
diff --git a/assets/javascripts/discourse/components/assignment.js b/assets/javascripts/discourse/components/assignment.js
index ca42d0c..97156ea 100644
--- a/assets/javascripts/discourse/components/assignment.js
+++ b/assets/javascripts/discourse/components/assignment.js
@@ -14,7 +14,7 @@ export default class Assignment extends Component {
   }
 
   get status() {
-    return this.args.status || this.assignStatuses[0];
+    return this.args.model.status || this.assignStatuses[0];
   }
 
   get assignStatuses() {