diff --git a/assets/javascripts/discourse/components/assign-user-form.hbs b/assets/javascripts/discourse/components/assign-user-form.hbs
index 0ef7771..73dc8b4 100644
--- a/assets/javascripts/discourse/components/assign-user-form.hbs
+++ b/assets/javascripts/discourse/components/assign-user-form.hbs
@@ -41,4 +41,6 @@
   </div>
 {{/if}}
 
-<Assignment @onSubmit={{this.assign}} />
\ No newline at end of file
+<Assignment
+  @note={{@model.note}}
+  @onSubmit={{this.assign}} />
diff --git a/assets/javascripts/discourse/components/assignment.hbs b/assets/javascripts/discourse/components/assignment.hbs
index e0a22eb..5a2b91c 100644
--- a/assets/javascripts/discourse/components/assignment.hbs
+++ b/assets/javascripts/discourse/components/assignment.hbs
@@ -1,13 +1,12 @@
 <div class="control-group assign-status">
   <label>
-    {{i18n "discourse_assign.assign_modal.note_label"}}&nbsp;<span
-    class="label-optional"
+    {{i18n "discourse_assign.assign_modal.note_label"}}&nbsp;<span class="label-optional"
   >{{i18n "discourse_assign.assign_modal.optional_label"}}</span>
   </label>
 
   <Textarea
     id="assign-modal-note"
-    @value={{@model.note}}
+    @value={{@note}}
     {{on "keydown" this.handleTextAreaKeydown}}
   />
 </div>