diff --git a/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs b/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
index 87913f7..39a48ce 100644
--- a/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
+++ b/assets/javascripts/discourse-assign/connectors/groups-interaction-custom-options/assignable-interaction-fields.hbs
@@ -11,7 +11,7 @@
     @valueProperty="value"
     @value={{assignableLevel}}
     @content={{assignableLevelOptions}}
-    @class="groups-form-assignable-level"
+    class="groups-form-assignable-level"
     @onChange={{action (mut model.assignable_level)}}
   />
 </div>
\ No newline at end of file
diff --git a/assets/javascripts/discourse-assign/controllers/assign-user.js b/assets/javascripts/discourse-assign/controllers/assign-user.js
index 57d8fe3..6ff4030 100644
--- a/assets/javascripts/discourse-assign/controllers/assign-user.js
+++ b/assets/javascripts/discourse-assign/controllers/assign-user.js
@@ -72,8 +72,8 @@ export default Controller.extend(ModalFunctionality, {
   },
 
   @action
-  handleTextAreaKeydown(value, event) {
-    if ((event.ctrlKey || event.metaKey) && event.key === "Enter") {
+  handleTextAreaKeydown(value) {
+    if ((value.ctrlKey || value.metaKey) && value.key === "Enter") {
       this.assign();
     }
   },
diff --git a/assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs b/assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs
index 751a8b7..4db83af 100644
--- a/assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs
+++ b/assets/javascripts/discourse/templates/components/remind-assigns-frequency.hbs
@@ -2,7 +2,7 @@
   <div class="controls controls-dropdown">
     <label>{{i18n "discourse_assign.reminders_frequency.description"}}</label>
     <ComboBox
-      @id="remind-assigns-frequency"
+      id="remind-assigns-frequency"
       @valueProperty="value"
       @content={{availableFrequencies}}
       @value={{selectedFrequency}}
diff --git a/assets/javascripts/discourse/templates/modal/assign-user.hbs b/assets/javascripts/discourse/templates/modal/assign-user.hbs
index ffcb211..4c34adf 100644
--- a/assets/javascripts/discourse/templates/modal/assign-user.hbs
+++ b/assets/javascripts/discourse/templates/modal/assign-user.hbs
@@ -1,4 +1,4 @@
-<DModalBody @class="assign">
+<DModalBody class="assign">
   <div>
     <div class="control-group {{if this.assigneeError 'assignee-error'}}">
       <label>{{i18n "discourse_assign.assign_modal.assignee_label"}}</label>
@@ -35,7 +35,7 @@
       <div class="control-group assign-status">
         <label>{{i18n "discourse_assign.assign_modal.status_label"}}</label>
         <ComboBox
-          @id="assign-status"
+          id="assign-status"
           @content={{availableStatuses}}
           @value={{status}}
           @onChange={{action (mut model.status)}}
@@ -60,16 +60,16 @@
 </DModalBody>
 
 <div class="modal-footer">
-  {{d-button
-    label=(if
+  <DButton
+    @label={{(if
       model.reassign
       "discourse_assign.reassign.title"
       "discourse_assign.assign_modal.assign"
-    )
-    icon=inviteIcon
-    action=(action "assign")
+    )}}
+    @icon={{inviteIcon}}
+    @action={{(action "assign")}}
     class="btn-primary"
-    disabled=disabled
-  }}
+    @disabled={{disabled}}
+  />
   <DModalCancel @close={{route-action "closeModal"}} />
 </div>
\ No newline at end of file