diff --git a/app/components/form/form-form.hbs b/app/components/form/form-form.hbs
index e71284722..762b398a7 100644
--- a/app/components/form/form-form.hbs
+++ b/app/components/form/form-form.hbs
@@ -1,10 +1,10 @@
 <ModelForm::DatetimeInput
-  @model={{model}}
+  @model={{@model}}
   @property='respondFrom'
   @label='Inschrijven vanaf'
 />
 <ModelForm::DatetimeInput
-  @model={{model}}
+  @model={{@model}}
   @property='respondUntil'
   @label='Inschrijven tot'
 />
@@ -26,9 +26,9 @@
         <div class='card'>
           <div class='card-body create-new-question'>
             {{#if question.isOpenQuestion}}
-              <Form::OpenQuestion @question={{question}} @form={{model}}/>
+              <Form::OpenQuestion @question={{question}} @form={{@model}}/>
             {{else}}
-              <Form::ClosedQuestion @question={{question}} @form={{model}}/>
+              <Form::ClosedQuestion @question={{question}} @form={{@model}}/>
             {{/if}}
           </div>
         </div>
@@ -39,14 +39,14 @@
       <button
         type='button'
         class='btn btn-default'
-        {{action 'addOpenQuestion'}}
+        {{on 'click' this.addOpenQuestion}}
       >
         Open vraag toevoegen
       </button>
       <button
         type='button'
         class='btn btn-default'
-        {{action 'addClosedQuestion'}}
+        {{on 'click' this.addClosedQuestion}}
       >
         Gesloten vraag toevoegen
       </button>
diff --git a/app/components/form/form-form.js b/app/components/form/form-form.js
index 038070ff0..16789f49b 100644
--- a/app/components/form/form-form.js
+++ b/app/components/form/form-form.js
@@ -1,31 +1,31 @@
 import { inject as service } from '@ember/service';
-import Component from '@ember/component';
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
 
-export const FormFormComponent = Component.extend({
-  model: null,
-  store: service(),
-  actions: {
-    createQuestion(modelClass, fieldType) {
-      const form = this.model;
-      const position = form.get('sortedQuestions.lastObject.position') + 1 || 0;
-      this.store.createRecord(modelClass, {
-        form,
-        fieldType,
-        position,
-        required: true,
-      });
-    },
-    addOpenQuestion() {
-      this.send('createQuestion', 'form/open-question', 'text');
-    },
-    addClosedQuestion() {
-      this.send('createQuestion', 'form/closed-question', 'radio');
-    },
-  },
-});
+export default class FormFormComponent extends Component {
+  @service store;
+  get model() {
+    return this.args.model;
+  }
 
-FormFormComponent.reopenClass({
-  positionalParams: ['model'],
-});
+  createQuestion(modelClass, fieldType) {
+    const form = this.model;
+    const position = form.get('sortedQuestions.lastObject.position') + 1 || 0;
+    this.store.createRecord(modelClass, {
+      form,
+      fieldType,
+      position,
+      required: true,
+    });
+  }
 
-export default FormFormComponent;
+  @action
+  addOpenQuestion() {
+    this.createQuestion('form/open-question', 'text');
+  }
+
+  @action
+  addClosedQuestion() {
+    this.createQuestion('form/closed-question', 'radio');
+  }
+}
diff --git a/app/components/form/response/open-question.hbs b/app/components/form/response/open-question.hbs
index 9bdba5e97..5fd684411 100644
--- a/app/components/form/response/open-question.hbs
+++ b/app/components/form/response/open-question.hbs
@@ -1,20 +1,20 @@
-{{#if (eq question.fieldType 'textarea')}}
+{{#if (eq @question.fieldType 'textarea')}}
   <ModelForm::TextareaInput
-    @model={{answer}}
+    @model={{@answer}}
     @property='answer'
     @inputLayout='vertical'
-    @label={{question.question}}
-    @inputIdentifier={{inputIdentifier}}
-    @required={{question.required}}
+    @label={{@question.question}}
+    @inputIdentifier={{this.inputIdentifier}}
+    @required={{@question.required}}
   />
 {{else}}
   <ModelForm::TextInput
-    @type={{question.fieldType}}
-    @model={{answer}}
+    @type={{@question.fieldType}}
+    @model={{@answer}}
     @property='answer'
     @inputLayout='vertical'
-    @label={{question.question}}
-    @inputIdentifier={{inputIdentifier}}
-    @required={{question.required}}
+    @label={{@question.question}}
+    @inputIdentifier={{this.inputIdentifier}}
+    @required={{@question.required}}
   />
 {{/if}}
\ No newline at end of file
diff --git a/app/components/form/response/open-question.js b/app/components/form/response/open-question.js
index d4f0d8f78..2c7e6d3ae 100644
--- a/app/components/form/response/open-question.js
+++ b/app/components/form/response/open-question.js
@@ -1,14 +1,7 @@
-import Component from '@ember/component';
-import { computed } from '@ember/object';
+import Component from '@glimmer/component';
 
-const OpenQuestionComponent = Component.extend({
-  inputIdentifier: computed('question.id', function () {
-    return `question-${this.question.id}`;
-  }),
-});
-
-OpenQuestionComponent.reopenClass({
-  positionalParams: ['question', 'answer'],
-});
-
-export default OpenQuestionComponent;
+export default class OpenQuestionComponent extends Component {
+  get inputIdentifier() {
+    return `question-${this.args.question.id}`;
+  }
+}
diff --git a/app/components/form/response/response-card.hbs b/app/components/form/response/response-card.hbs
index 84f053c9f..5f35765b5 100644
--- a/app/components/form/response/response-card.hbs
+++ b/app/components/form/response/response-card.hbs
@@ -1,25 +1,27 @@
-<div class='card-header mt-2'>
-  <div class='d-flex justify-content-between'>
-    <h5>Inschrijven</h5>
-    <span class='text-muted'>{{form-opened-label form}}</span>
+<div class="card">
+  <div class='card-header mt-2'>
+    <div class='d-flex justify-content-between'>
+      <h5>Inschrijven</h5>
+      <span class='text-muted'>{{form-opened-label @form}}</span>
+    </div>
   </div>
-</div>
-<div class='card-body'>
-  <form {{action 'submitResponse' on='submit'}}>
-    {{form/response/response-form form response}}
+  <div class='card-body'>
+    <form {{on 'submit' (prevent-default this.submitResponse)}}>
+      <Form::Response::ResponseForm @form={{@form}} @response={{@response}} />
 
-    <ModelForm::FormActions
-      @errors={{form.errors}}
-      @errorMessage={{this.errorMessage}}
-      @submitButtonLabel='Inschrijven'
-      @inputLayout='vertical'
-    >
-      {{#if form.questions}}
-        <LinkTo @route='activities' class='btn btn-default'>
-          Annuleren
-        </LinkTo>
-        Vragen met een * zijn verplicht
-      {{/if}}
-    </ModelForm::FormActions>
-  </form>
+      <ModelForm::FormActions
+        @errors={{@form.errors}}
+        @errorMessage={{this.errorMessage}}
+        @submitButtonLabel='Inschrijven'
+        @inputLayout='vertical'
+      >
+        {{#if @form.questions}}
+          <LinkTo @route='activities' class='btn btn-default'>
+            Annuleren
+          </LinkTo>
+          Vragen met een * zijn verplicht
+        {{/if}}
+      </ModelForm::FormActions>
+    </form>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/components/form/response/response-card.js b/app/components/form/response/response-card.js
index 0e184c17f..2fa6f365c 100644
--- a/app/components/form/response/response-card.js
+++ b/app/components/form/response/response-card.js
@@ -1,45 +1,31 @@
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
 
-const FormResponseCardComponent = Component.extend({
-  flashNotice: service('flash-notice'),
-  classNames: ['card'],
-  form: null,
-  response: null,
-  errorMessage: null,
-  actions: {
-    submitResponse() {
-      this.response
-        .saveWithAnswers()
-        .then(() => {
-          // The response is the first thing that is saved (in order to save answers), so currently the response is
-          // always 'incomplete'. Furthermore, the form has a field 'amountOfResponses' which should be updated.
-          // We now reload the response and the corresponding form.
-          this.response.reload();
-          this.form.reload();
-          this.flashNotice.sendSuccess('Inschrijving opgeslagen');
-        })
-        .catch((error) => {
-          this.set('errorMessage', error.message);
-          if (
-            error.payload?.errors &&
-            error.payload.errors.isAny(
-              'source.pointer',
-              '/data/attributes/user'
-            )
-          ) {
-            this.set(
-              'errorMessage',
-              'Er is al een response gevonden, probeer eerst te refreshen, zie je dit formulier dan nog? Neem dan contact op met de ict-commissie.'
-            );
-          }
-        });
-    },
-  },
-});
+export default class FormResponseCardComponent extends Component {
+  @service flashNotice;
+  @tracked errorMessage = null;
 
-FormResponseCardComponent.reopenClass({
-  positionalParams: ['form', 'response'],
-});
-
-export default FormResponseCardComponent;
+  @action
+  async submitResponse() {
+    try {
+      await this.args.response.saveWithAnswers();
+      // The response is the first thing that is saved (in order to save answers), so currently the response is
+      // always 'incomplete'. Furthermore, the form has a field 'amountOfResponses' which should be updated.
+      // We now reload the response and the corresponding form.
+      this.args.response.reload();
+      this.args.form.reload();
+      this.flashNotice.sendSuccess('Inschrijving opgeslagen');
+    } catch (error) {
+      this.errorMessage = error.message;
+      if (
+        error.payload?.errors &&
+        error.payload.errors.isAny('source.pointer', '/data/attributes/user')
+      ) {
+        this.errorMessage =
+          'Er is al een response gevonden, probeer eerst te refreshen, zie je dit formulier dan nog? Neem dan contact op met de ict-commissie.';
+      }
+    }
+  }
+}
diff --git a/app/components/form/response/response-form.hbs b/app/components/form/response/response-form.hbs
index e282ec966..08ffae72b 100644
--- a/app/components/form/response/response-form.hbs
+++ b/app/components/form/response/response-form.hbs
@@ -1,15 +1,13 @@
-{{#each form.sortedQuestions as |question|}}
+{{#each @form.sortedQuestions as |question|}}
   {{#if question.isOpenQuestion}}
-    {{form/response/open-question
-      question
-      question.linkedAnswer
-      data-test-open-question=question.id
-    }}
+    <Form::Response::OpenQuestion
+      @question={{question}}
+      @answer={{question.linkedAnswer}}/>
   {{else if question.isMultipleChoice}}
     {{form/response/multiple-choice-question
       question
       question.linkedAnswers
-      updateAnswers=(action 'updateMultipleChoiceAnswers')
+      updateAnswers=this.updateMultipleChoiceAnswers
       data-test-closed-question=question.id
     }}
   {{else}}
diff --git a/app/components/form/response/response-form.js b/app/components/form/response/response-form.js
index 0b51033b5..e745ec79d 100644
--- a/app/components/form/response/response-form.js
+++ b/app/components/form/response/response-form.js
@@ -1,46 +1,40 @@
 import { inject as service } from '@ember/service';
-import Component from '@ember/component';
+import Component from '@glimmer/component';
+import { action } from '@ember/object';
 
-const FormResponseComponent = Component.extend({
-  store: service(),
-  actions: {
-    updateMultipleChoiceAnswers(question, optionIds) {
-      setTimeout(() => {
-        const answers = question.get('linkedAnswers');
-        const previousOptionIds = answers
-          .mapBy('option.id')
-          .rejectBy('isDeleted');
-        const removedOptionIds = previousOptionIds.reject((id) =>
-          optionIds.includes(id)
-        );
-        const addedOptionIds = optionIds.reject((id) =>
-          previousOptionIds.includes(id)
-        );
-
-        removedOptionIds.forEach((removedOptionId) => {
-          const removedAnswer = answers.findBy('option.id', removedOptionId);
-          answers.removeObject(removedAnswer);
-          removedAnswer.deleteRecord();
-        });
+export default class FormResponseComponent extends Component {
+  @service store;
+  @action
+  updateMultipleChoiceAnswers(question, optionIds) {
+    setTimeout(() => {
+      const answers = question.get('linkedAnswers');
+      const previousOptionIds = answers
+        .mapBy('option.id')
+        .rejectBy('isDeleted');
+      const removedOptionIds = previousOptionIds.reject((id) =>
+        optionIds.includes(id)
+      );
+      const addedOptionIds = optionIds.reject((id) =>
+        previousOptionIds.includes(id)
+      );
 
-        addedOptionIds.forEach((addedOptionId) => {
-          const option = this.store.peekRecord(
-            'form/closed-question-option',
-            addedOptionId
-          );
-          const addedAnswer = this.store.createRecord(
-            'form/closed-question-answer',
-            { response: this.response, option }
-          );
-          answers.push(addedAnswer);
-        });
-      }, 10);
-    },
-  },
-});
+      removedOptionIds.forEach((removedOptionId) => {
+        const removedAnswer = answers.findBy('option.id', removedOptionId);
+        answers.removeObject(removedAnswer);
+        removedAnswer.deleteRecord();
+      });
 
-FormResponseComponent.reopenClass({
-  positionalParams: ['form', 'response'],
-});
-
-export default FormResponseComponent;
+      addedOptionIds.forEach((addedOptionId) => {
+        const option = this.store.peekRecord(
+          'form/closed-question-option',
+          addedOptionId
+        );
+        const addedAnswer = this.store.createRecord(
+          'form/closed-question-answer',
+          { response: this.args.response, option }
+        );
+        answers.push(addedAnswer);
+      });
+    }, 10);
+  }
+}
diff --git a/app/components/form/responses-table-card.hbs b/app/components/form/responses-table-card.hbs
index 065fc9b78..8e58b3c36 100644
--- a/app/components/form/responses-table-card.hbs
+++ b/app/components/form/responses-table-card.hbs
@@ -1,17 +1,17 @@
-{{#if form.amountOfResponses}}
+{{#if @form.amountOfResponses}}
   <div class='card'>
     <div class='card-header my-2 py-1'>
       <div class='row align-items-center'>
         <h5 class='card-title col'>Inschrijvingen</h5>
         <div class='col col-md-auto d-flex align-items-center flex-wrap'>
-          <button class='btn btn-primary btn-sm me-3 my-2 text-nowrap' type="button" {{on 'click' (action 'copyUsernames')}}>
+          <button class='btn btn-primary btn-sm me-3 my-2 text-nowrap' type="button" {{on 'click' this.copyUsernames}}>
             Kopieer gebruikersnamen
           </button>
           <div class="form-check">
             <Input
                 @type='checkbox'
                 id='show-allergy-info'
-                @checked={{showAllergyInfo}}
+                @checked={{this.showAllergyInfo}}
                 class='form-check-input'
             />
             <label class='form-check-label' for='show-allergy-info'>
@@ -22,11 +22,7 @@
       </div>
     </div>
     <div class='table-responsive responses-table'>
-      {{form/responses-table
-        form
-        form.responses
-        showAllergyInfo=showAllergyInfo
-      }}
+      <Form::ResponsesTable @form={{@form}} @responses={{@form.responses}} @showAllergyInfo={{this.showAllergyInfo}} />
     </div>
   </div>
 {{else}}
diff --git a/app/components/form/responses-table-card.js b/app/components/form/responses-table-card.js
index 2cf9777f4..bf7d2cb6f 100644
--- a/app/components/form/responses-table-card.js
+++ b/app/components/form/responses-table-card.js
@@ -1,26 +1,22 @@
-import Component from '@ember/component';
+import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { tracked } from '@glimmer/tracking';
 
-const FormResponsesTableCardComponent = Component.extend({
-  session: service('session'),
-  actions: {
-    copyUsernames() {
-      let usernames = this.form
-        .get('responses')
-        .map((response) => response.get('user.username'));
-      if (!this.form.currentUserResponseCompleted) {
-        usernames = usernames.filter(
-          (name) => name !== this.session.currentUser.username
-        );
-      }
-      usernames = usernames.join('\n');
-      navigator.clipboard.writeText(usernames);
-    },
-  },
-});
-
-FormResponsesTableCardComponent.reopenClass({
-  positionalParams: ['form'],
-});
-
-export default FormResponsesTableCardComponent;
+export default class FormResponsesTableCardComponent extends Component {
+  @service session;
+  @tracked showAllergyInfo = false;
+  @action
+  copyUsernames() {
+    let usernames = this.form
+      .get('responses')
+      .map((response) => response.get('user.username'));
+    if (!this.form.currentUserResponseCompleted) {
+      usernames = usernames.filter(
+        (name) => name !== this.session.currentUser.username
+      );
+    }
+    usernames = usernames.join('\n');
+    navigator.clipboard.writeText(usernames);
+  }
+}
diff --git a/app/components/forms/activity-form.hbs b/app/components/forms/activity-form.hbs
index 66b21e1a5..2f9345ac1 100644
--- a/app/components/forms/activity-form.hbs
+++ b/app/components/forms/activity-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Activiteit aanmaken' 'Activiteit wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
 
       {{#if @model.form.hasResponses}}
         <div class='alert alert-danger'>
@@ -106,7 +106,7 @@
             <div class='col-sm-10'>
               <PowerSelect
                 @options={{@groups}}
-                @onChange={{action (mut @model.group)}}
+                @onChange={{fn (mut @model.group)}}
                 @selected={{@model.group}}
                 @searchEnabled={{true}}
                 @searchField='name'
@@ -154,7 +154,7 @@
         @errorMessage={{@errorMessage}}
       >
         <button
-          {{action @onCancel}}
+          {{on 'click' @onCancel}}
           type="button"
           class='btn btn-default'
         >
@@ -171,7 +171,7 @@
       <h5>Inschrijflijst</h5>
     </div>
     <div class='card-block p-3'>
-      {{form/form-form @model.form}}
+      <Form::FormForm @model={{@model.form}}/>
     </div>
   </div>
 {{/if}}
\ No newline at end of file
diff --git a/app/components/forms/article-form.hbs b/app/components/forms/article-form.hbs
index 337cefa2f..21db2fb95 100644
--- a/app/components/forms/article-form.hbs
+++ b/app/components/forms/article-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Artikel aanmaken' 'Artikel wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='title'
@@ -51,7 +51,7 @@
         <div class='col-sm-10'>
           <PowerSelect
             @options={{@groups}}
-            @onChange={{action (mut @model.group)}}
+            @onChange={{fn (mut @model.group)}}
             @selected={{@model.group}}
             @searchEnabled={{true}}
             @searchField='name'
@@ -78,7 +78,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <button {{action @onCancel}} type="button" class='btn btn-default'>Annuleren</button>
+        <button {{on 'click' @onCancel}} type="button" class='btn btn-default'>Annuleren</button>
       </ModelForm::FormActions>
     </form>
   </div>
diff --git a/app/components/forms/book-form.hbs b/app/components/forms/book-form.hbs
index a25f5efe7..605b4ca4b 100644
--- a/app/components/forms/book-form.hbs
+++ b/app/components/forms/book-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Boek aanmaken' 'Boek wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='isbn'
@@ -99,7 +99,7 @@
         @errorMessage={{@errorMessage}}
       >
         <button
-          {{action @onCancel}}
+          {{on 'click' @onCancel}}
           type="button"
           class='btn btn-default'
         >
diff --git a/app/components/forms/category-form.hbs b/app/components/forms/category-form.hbs
index ea030c6db..966b4eb56 100644
--- a/app/components/forms/category-form.hbs
+++ b/app/components/forms/category-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Categorie aanmaken' 'Categorie wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='name'
@@ -15,7 +15,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <button {{action @onCancel}} type="button" class='btn btn-default'>
+        <button {{on 'click' @onCancel}} type="button" class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>
diff --git a/app/components/forms/group-form.hbs b/app/components/forms/group-form.hbs
index ba0df553f..5ae7d5374 100644
--- a/app/components/forms/group-form.hbs
+++ b/app/components/forms/group-form.hbs
@@ -1,4 +1,4 @@
-<form {{action @onSubmit on='submit'}}>
+<form {{on 'submit' (prevent-default @onSubmit)}}>
   <div class='card'>
     <div class='card-header'>
       <h5>Details</h5>
@@ -55,7 +55,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <button {{action @onCancel}} type="button" class='btn btn-default'>Annuleren</button>
+        <button {{on 'click' @onCancel}} type="button" class='btn btn-default'>Annuleren</button>
       </ModelForm::FormActions>
     </div>
   </div>
@@ -136,7 +136,7 @@
                           <button
                             type='button'
                             class='btn btn-danger'
-                            {{action @onRemoveMembership membership}}
+                            {{on 'click' (fn @onRemoveMembership membership)}}
                           >
                             <FaIcon @icon='trash' />
                           </button>
diff --git a/app/components/forms/mail-alias-form.hbs b/app/components/forms/mail-alias-form.hbs
index 1dfbe9810..b0605c941 100644
--- a/app/components/forms/mail-alias-form.hbs
+++ b/app/components/forms/mail-alias-form.hbs
@@ -3,7 +3,7 @@
     <h2>Details</h2>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='email'
@@ -29,7 +29,7 @@
         <div class='col-sm-9'>
           <PowerSelect
             @options={{@groups}}
-            @onChange={{action (mut @model.moderatorGroup)}}
+            @onChange={{fn (mut @model.moderatorGroup)}}
             @selected={{@model.moderatorGroup}}
             @disabled={{@moderationTypeOpen}}
             @placeholder='Moderator'
@@ -59,7 +59,7 @@
         <div class='col-sm-9'>
           <PowerSelect
             @options={{@groups}}
-            @onChange={{action (mut @model.group)}}
+            @onChange={{fn (mut @model.group)}}
             @selected={{@model.group}}
             @disabled={{@anyUser}}
             @placeholder='Groep'
@@ -81,7 +81,7 @@
         <div class='col-sm-9'>
           <PowerSelect
             @options={{@users}}
-            @onChange={{action (mut @model.user)}}
+            @onChange={{fn (mut @model.user)}}
             @selected={{@model.user}}
             @disabled={{@anyGroup}}
             @placeholder='Gebruiker'
@@ -110,7 +110,7 @@
         @errorMessage={{@errorMessage}}
         @formActionWrapperClass="col-sm-9"
       >
-        <button {{action @onCancel}} type="button" class='btn btn-default'>
+        <button {{on 'click' @onCancel}} type="button" class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>
diff --git a/app/components/forms/mandate-form.hbs b/app/components/forms/mandate-form.hbs
index 7b82e0187..653a06f23 100644
--- a/app/components/forms/mandate-form.hbs
+++ b/app/components/forms/mandate-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Mandaat aanmaken' 'Mandaat wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::DateInput
         @model={{@model}}
         @property='startDate'
@@ -27,7 +27,7 @@
         <div class='col-sm-10'>
           <PowerSelect
             @options={{@users}}
-            @onChange={{action (mut @model.user)}}
+            @onChange={{fn (mut @model.user)}}
             @selected={{@model.user}}
             @searchEnabled={{true}}
             @searchField='fullName'
@@ -41,7 +41,7 @@
       </div>
 
       <ModelForm::FormActions @model={{@model}} @errorMessage={{@errorMessage}}>
-        <button {{action @onCancel}} type="button" class='btn btn-default'>
+        <button {{on 'click' @onCancel}} type="button" class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>
diff --git a/app/components/forms/photo-album-form.hbs b/app/components/forms/photo-album-form.hbs
index 49c884a2b..fe13348ae 100644
--- a/app/components/forms/photo-album-form.hbs
+++ b/app/components/forms/photo-album-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Fotoalbum aanmaken' 'Fotoalbum wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='title'
@@ -39,7 +39,7 @@
         <div class='col-sm-10'>
           <PowerSelect
             @options={{@groups}}
-            @onChange={{action (mut @model.group)}}
+            @onChange={{fn (mut @model.group)}}
             @selected={{@model.group}}
             @searchEnabled={{true}}
             @searchField='name'
@@ -86,7 +86,7 @@
         @errors={{@model.errors}}
         @errorMessage={{@errorMessage}}
       >
-        <button {{action @onCancel}} type='button' class='btn btn-default'>
+        <button {{on 'click' @onCancel}} type='button' class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>
diff --git a/app/components/forms/poll-form.hbs b/app/components/forms/poll-form.hbs
index 99a18a931..106a15dcb 100644
--- a/app/components/forms/poll-form.hbs
+++ b/app/components/forms/poll-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Poll aanmaken' 'Poll wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::DatetimeInput
         @model={{@model}}
         @property='respondFrom'
@@ -37,7 +37,7 @@
         @errorMessage={{@errorMessage}}
       >
         <button
-          {{action @onCancel}}
+          {{on 'click' @onCancel}}
           type="button"
           class='btn btn-default'
         >
diff --git a/app/components/forms/post-form.hbs b/app/components/forms/post-form.hbs
index 399e6eb71..000ed4b01 100644
--- a/app/components/forms/post-form.hbs
+++ b/app/components/forms/post-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Forumbericht aanmaken' 'Forumbericht wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
 
       <div class='row'>
         <label
@@ -22,7 +22,7 @@
         @errorMessage={{@errorMessage}}
       >
         <button
-          {{action @onCancel}}
+          {{on 'click' @onCancel}}
           type="button"
           class='btn btn-default'
         >
diff --git a/app/components/forms/room-advert-form.hbs b/app/components/forms/room-advert-form.hbs
index 7c9139f01..734912fb7 100644
--- a/app/components/forms/room-advert-form.hbs
+++ b/app/components/forms/room-advert-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Kamer advertentie aanmaken' 'Kamer advertentie wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='houseName'
diff --git a/app/components/forms/static-page-form.hbs b/app/components/forms/static-page-form.hbs
index dff173d77..31a51cdf9 100644
--- a/app/components/forms/static-page-form.hbs
+++ b/app/components/forms/static-page-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Infopagina aanmaken' 'Infopagina wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='title'
@@ -46,7 +46,7 @@
       </div>
 
       <ModelForm::FormActions @model={{@model}} @errorMessage={{@errorMessage}}>
-        <button {{action @onCancel}} type="button" class='btn btn-default'>
+        <button {{on 'click' @onCancel}} type="button" class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>
diff --git a/app/components/forms/thread-form.hbs b/app/components/forms/thread-form.hbs
index c82311975..4d9aa98e4 100644
--- a/app/components/forms/thread-form.hbs
+++ b/app/components/forms/thread-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Topic aanmaken' 'Topic wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='title'
@@ -37,7 +37,7 @@
         @errorMessage={{@errorMessage}}
       >
         <button
-          {{action @onCancel}}
+          {{on 'click' @onCancel}}
           type="button"
           class='btn btn-default'
         >
diff --git a/app/components/forms/transaction-form.hbs b/app/components/forms/transaction-form.hbs
index fe3c44309..ef490082e 100644
--- a/app/components/forms/transaction-form.hbs
+++ b/app/components/forms/transaction-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Transactie aanmaken' 'Transactie wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='description'
@@ -36,7 +36,7 @@
       </div>
 
       <ModelForm::FormActions @model={{@model}} @errorMessage={{@errorMessage}}>
-        <button {{action @onCancel}} type="button" class='btn btn-default'>
+        <button {{on 'click' @onCancel}} type="button" class='btn btn-default'>
           Annuleren
         </button>
       </ModelForm::FormActions>
diff --git a/app/components/forms/user-form.hbs b/app/components/forms/user-form.hbs
index ef0d1e97f..83a517210 100644
--- a/app/components/forms/user-form.hbs
+++ b/app/components/forms/user-form.hbs
@@ -1,4 +1,4 @@
-<form class='form' {{action @onSubmit on='submit'}}>
+<form class='form' {{on 'submit' (prevent-default @onSubmit)}}>
   <h5>Publieke gegevens</h5>
   <p>Deze gegevens zijn zichtbaar voor alle leden en oud-leden.</p>
   <ModelForm::FileInput
@@ -177,7 +177,7 @@
     @errorMessage={{@errorMessage}}
     @inputLayout='vertical'
   >
-    <button {{action @onCancel}} type="button" class='btn btn-default'>
+    <button {{on 'click' @onCancel}} type="button" class='btn btn-default'>
       Annuleren
     </button>
   </ModelForm::FormActions>
diff --git a/app/components/forms/vacancy-form.hbs b/app/components/forms/vacancy-form.hbs
index 60786d489..a156b900b 100644
--- a/app/components/forms/vacancy-form.hbs
+++ b/app/components/forms/vacancy-form.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Vacature aanmaken' 'Vacature wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{action @onSubmit on='submit'}}>
+    <form {{on 'submit' (prevent-default @onSubmit)}}>
       <ModelForm::TextInput
         @model={{@model}}
         @property='title'
@@ -48,7 +48,7 @@
             <div class='col-sm-10'>
               <PowerSelect
                 @options={{@groups}}
-                @onChange={{action (mut @model.group)}}
+                @onChange={{fn (mut @model.group)}}
                 @selected={{@model.group}}
                 @searchEnabled={{true}}
                 @searchField='name'
@@ -76,7 +76,7 @@
         @errorMessage={{@errorMessage}}
       >
         <button
-          {{action @onCancel}}
+          {{on 'click' @onCancel}}
           type="button"
           class='btn btn-default'
         >
diff --git a/app/components/forum/forum-post-new.hbs b/app/components/forum/forum-post-new.hbs
index 1c4e62564..958ed41b4 100644
--- a/app/components/forum/forum-post-new.hbs
+++ b/app/components/forum/forum-post-new.hbs
@@ -3,7 +3,7 @@
 </p>
 <div class='card-footer'>
   <div class='row justify-content-end'>
-    <a href='#' class='btn btn-default w-auto me-2' {{action 'cancel'}}>Annuleren</a>
-    <a href='#' class='btn btn-secondary w-auto' {{action 'save'}}>Opslaan</a>
+    <a href='#' class='btn btn-default w-auto me-2' {{on 'click' cancel}}>Annuleren</a>
+    <a href='#' class='btn btn-secondary w-auto' {{on 'click' save}}>Opslaan</a>
   </div>
 </div>
\ No newline at end of file
diff --git a/app/components/forum/forum-post.hbs b/app/components/forum/forum-post.hbs
index 9c5e3d309..b5c3fe334 100644
--- a/app/components/forum/forum-post.hbs
+++ b/app/components/forum/forum-post.hbs
@@ -75,7 +75,7 @@
             <FaIcon
               @icon='quote-left'
               class='link-highlight'
-              {{on 'click' (action 'quote')}}
+              {{on 'click' quote}}
             />
           </span>
         {{/if}}
@@ -84,7 +84,7 @@
           <FaIcon
             @icon='code'
             class='link-highlight'
-            {{on 'click' (action 'toggleShowMarkdown')}}
+            {{on 'click' toggleShowMarkdown}}
           />
         </span>
       </span>
diff --git a/app/components/input/date-input.hbs b/app/components/input/date-input.hbs
index fe80f149c..35f8bdf23 100644
--- a/app/components/input/date-input.hbs
+++ b/app/components/input/date-input.hbs
@@ -12,7 +12,7 @@
   <input
     {{pikaday
       value=@dateValue
-      onSelect=(action 'onPikadaySelection')
+      onSelect=onPikadaySelection
       format=this.pikadayFormat
       yearRange=@yearRange
       i18n=this.pikadayI18n
diff --git a/app/components/md-editor/md-editor-toolbar.hbs b/app/components/md-editor/md-editor-toolbar.hbs
index 29a54b41f..9370df8f5 100644
--- a/app/components/md-editor/md-editor-toolbar.hbs
+++ b/app/components/md-editor/md-editor-toolbar.hbs
@@ -77,10 +77,10 @@
   </div>
 </div>
 
-<BsModal 
-  @onSubmit={{this.submitModal}} 
-  @onHidden={{action (mut modalOpen) false}} 
-  @fade={{true}} 
+<BsModal
+  @onSubmit={{this.submitModal}}
+  @onHidden={{fn (mut modalOpen) false}}
+  @fade={{true}}
   @open={{modalOpen}} as |Modal|
 >
   <Modal.header>
@@ -97,7 +97,7 @@
     />
   </Modal.body>
   <Modal.footer as |footer|>
-    <BsButton @onClick={{action Modal.close}} @type="default">Sluiten</BsButton>
-    <BsButton @onClick={{action Modal.submit}} @type="primary">Invoegen</BsButton>
+    <BsButton @onClick={{Modal.close}} @type="default">Sluiten</BsButton>
+    <BsButton @onClick={{Modal.submit}} @type="primary">Invoegen</BsButton>
   </Modal.footer>
 </BsModal>
\ No newline at end of file
diff --git a/app/components/model-form/file-input.hbs b/app/components/model-form/file-input.hbs
index a9c2dc03a..8f714617c 100644
--- a/app/components/model-form/file-input.hbs
+++ b/app/components/model-form/file-input.hbs
@@ -2,7 +2,7 @@
   {{label}}{{if required ' *'}}
 </label>
 <div class='{{inputWrapperClass}}'>
-  {{#let (file-queue name="fileUpload" onFileAdded=(action 'fileLoaded')) as |queue|}}
+  {{#let (file-queue name="fileUpload" onFileAdded=fileLoaded) as |queue|}}
     <label for="upload-file" class="form-label {{if not (get model property) "border rounded p-2 w-100"}}">
       {{#if (get model property)}}
         <img id={{inputIdentifier}} src={{mut (get model property)}} alt={{label}} role="button" tabindex="0"
diff --git a/app/components/photo-albums/photo.hbs b/app/components/photo-albums/photo.hbs
index 267c27bf3..b803fce93 100644
--- a/app/components/photo-albums/photo.hbs
+++ b/app/components/photo-albums/photo.hbs
@@ -19,7 +19,7 @@
       {{#if @model.hasExif}}
         <button
           class='ms-1 btn btn-sm btn-outline-info'
-          {{action 'toggleShowExif'}}
+          {{on 'click' toggleShowExif}}
           type='button'
         >
           Toon Exif data
diff --git a/app/components/photo-comments/comments.hbs b/app/components/photo-comments/comments.hbs
index affb3f270..48ad60804 100644
--- a/app/components/photo-comments/comments.hbs
+++ b/app/components/photo-comments/comments.hbs
@@ -40,7 +40,7 @@
           />
           <button
             class='btn btn-default'
-            {{action 'submitPhotoComment'}}
+            {{on 'click' submitPhotoComment}}
             type='button'
           >
             Reageren
diff --git a/app/components/poll/closed-question.hbs b/app/components/poll/closed-question.hbs
index dbd9de3c7..4680aac47 100644
--- a/app/components/poll/closed-question.hbs
+++ b/app/components/poll/closed-question.hbs
@@ -47,21 +47,21 @@
           <button
             type='button'
             class='btn btn-default'
-            {{action 'moveOptionUp' opt}}
+            {{on 'click' (fn moveOptionUp opt)}}
           >
             <FaIcon @icon='arrow-up' />
           </button>
           <button
             type='button'
             class='btn btn-default'
-            {{action 'moveOptionDown' opt}}
+            {{on 'click' (fn moveOptionDown opt)}}
           >
             <FaIcon @icon='arrow-down' />
           </button>
           <button
             type='button'
             class='btn btn-default'
-            {{action 'deleteOption' opt}}
+            {{on 'click' (fn deleteOption opt)}}
           >
             <FaIcon @icon='trash' />
           </button>
@@ -72,7 +72,7 @@
 {{/each}}
 
 {{#unless question.form.hasResponses}}
-  <button type='button' class='btn btn-default' {{action 'addOption'}}>
+  <button type='button' class='btn btn-default' {{on 'click' addOption}}>
     Optie toevoegen
   </button>
 {{/unless}}
\ No newline at end of file
diff --git a/app/components/public/index/activities.hbs b/app/components/public/index/activities.hbs
index 7d39ecea8..ad21fb370 100644
--- a/app/components/public/index/activities.hbs
+++ b/app/components/public/index/activities.hbs
@@ -22,7 +22,7 @@
 {{#if modalIsOpen}}
   <EmberWormhole @to='ember-wormhole-destination'>
     <div class='public-index-activity-modal modal d-block'>
-      <div class='activity-modal-backdrop' {{action 'closeModal'}}></div>
+      <div class='activity-modal-backdrop' {{on 'click' closeModal}}></div>
       <div class='activity-modal-content-wrapper modal-dialog' role='document'>
         <div class='modal-content'>
           <div class='modal-body'>
@@ -38,7 +38,7 @@
             <button
               type='button'
               class='btn btn-default'
-              {{action 'closeModal'}}
+              {{on 'click' closeModal}}
             >
               {{t 'tag.button.close'}}
             </button>
diff --git a/app/components/public/index/youtube-videos.hbs b/app/components/public/index/youtube-videos.hbs
index d274c794c..b71d125c7 100644
--- a/app/components/public/index/youtube-videos.hbs
+++ b/app/components/public/index/youtube-videos.hbs
@@ -17,7 +17,7 @@
               <div
                 class='public-index-videos__video'
                 title='{{video.title}}'
-                {{action 'changeVideo' video}}
+                {{on 'click' (fn changeVideo video)}}
               >
                 <img
                   src='https://img.youtube.com/vi/{{video.videoId}}/maxresdefault.jpg'
diff --git a/app/components/users/otp-settings.hbs b/app/components/users/otp-settings.hbs
index e3eec6348..b6bf9b6f5 100644
--- a/app/components/users/otp-settings.hbs
+++ b/app/components/users/otp-settings.hbs
@@ -19,7 +19,7 @@
           <button
             type='button'
             class='btn btn-primary float-end'
-            {{action 'disableOTP'}}
+            {{on 'click' disableOTP}}
           >
             Deactiveren
           </button>
@@ -75,7 +75,7 @@
       </div>
     {{/if}}
 
-    <form class='form' {{action 'confirmOTP' on='submit'}}>
+    <form class='form' {{on 'submit' (prevent-default confirmOTP)}}>
       <div>
         <QrCode @text={{this.otpKey}} @size={{240}} />
       </div>
@@ -113,7 +113,7 @@
       </div>
     {{/if}}
 
-    <button type='button' class='btn btn-primary' {{action 'generateOTP'}}>
+    <button type='button' class='btn btn-primary' {{on 'click' generateOTP}}>
       Instellen
     </button>
   {{/if}}
diff --git a/app/components/users/password-settings.hbs b/app/components/users/password-settings.hbs
index 7f5fde9dc..bfe008968 100644
--- a/app/components/users/password-settings.hbs
+++ b/app/components/users/password-settings.hbs
@@ -1,6 +1,6 @@
 <h5>Wachtwoord wijzigen </h5>
 
-<form class='form' {{action 'changePassword' on='submit'}}>
+<form class='form' {{on 'submit' (prevent-default changePassword)}}>
   {{#if this.passwordErrorMessage}}
     <div class='alert alert-danger' role='alert'>
       <strong>{{this.passwordErrorMessage}}</strong>
diff --git a/app/components/users/privacy-settings.hbs b/app/components/users/privacy-settings.hbs
index c46b6bc30..27ebdd611 100644
--- a/app/components/users/privacy-settings.hbs
+++ b/app/components/users/privacy-settings.hbs
@@ -1,5 +1,5 @@
 <h5>Privacyinstellingen</h5>
-<form class='form' {{action @onSubmit on='submit'}}>
+<form class='form' {{on 'submit' (prevent-default @onSubmit)}}>
   {{#if isOwnUser}}
     <div class='mb-3 row align-items-center'>
       <label class='col-sm-6 col-form-label form-label'>
@@ -93,7 +93,7 @@
       @errorMessage={{this.errorMessage}}
       @inputLayout='vertical'
     >
-      <button {{action @onCancel}} type="button" class='btn btn-default'>
+      <button {{on 'click' @onCancel}} type="button" class='btn btn-default'>
         Annuleren
       </button>
     </ModelForm::FormActions>
diff --git a/app/controllers/debit/collections/collection/edit.js b/app/controllers/debit/collections/collection/edit.js
index 0063c425c..5205576f7 100644
--- a/app/controllers/debit/collections/collection/edit.js
+++ b/app/controllers/debit/collections/collection/edit.js
@@ -26,8 +26,7 @@ export default class CollectionEditController extends EditController {
   }
 
   @action
-  async submit(event) {
-    event.preventDefault();
+  async submit() {
     this.errorMessage = null;
     try {
       await this.model.saveWithTransactions();
diff --git a/app/controllers/login.js b/app/controllers/login.js
index 31558399e..fa28c31b2 100644
--- a/app/controllers/login.js
+++ b/app/controllers/login.js
@@ -14,9 +14,7 @@ export default class LoginController extends Controller {
   @tracked twoFactorRequired;
 
   @action
-  async authenticate(e) {
-    e.preventDefault();
-
+  async authenticate() {
     const headers = {};
     if (this.twoFactorRequired) {
       headers['X-Amber-OTP'] = this.verificationCode;
diff --git a/app/helpers/prevent-default.js b/app/helpers/prevent-default.js
new file mode 100644
index 000000000..dd1c87202
--- /dev/null
+++ b/app/helpers/prevent-default.js
@@ -0,0 +1,10 @@
+import { helper } from '@ember/component/helper';
+
+export function preventDefault([functionToCall]) {
+  return function (event) {
+    event.preventDefault();
+    functionToCall.apply(this, event, ...arguments);
+  };
+}
+
+export default helper(preventDefault);
diff --git a/app/templates/activities/activity/generate-alias.hbs b/app/templates/activities/activity/generate-alias.hbs
index ca453dd43..eefa18e07 100644
--- a/app/templates/activities/activity/generate-alias.hbs
+++ b/app/templates/activities/activity/generate-alias.hbs
@@ -25,7 +25,7 @@
       <button
         type='button'
         class='btn btn-danger mb-2'
-        {{action 'generateAlias'}}
+        {{on 'click' generateAlias}}
       >
         Mailalias aanmaken
       </button>
diff --git a/app/templates/activities/activity/print-enrolled.hbs b/app/templates/activities/activity/print-enrolled.hbs
index 1c3deb56b..6ae016c10 100644
--- a/app/templates/activities/activity/print-enrolled.hbs
+++ b/app/templates/activities/activity/print-enrolled.hbs
@@ -48,19 +48,19 @@
               <br />
               <ul
                 class='list-group'
-                {{sortable-group onChange=(action 'reorderItems')}}
+                {{sortable-group onChange=reorderItems}}
               >
                 {{#each this.options as |option index|}}
                   <li class='list-group-item' {{sortable-item model=option}}>
                     <div class='row'>
                       <span class='col'>{{option}}</span>
                       <a
-                        class='ps-2 link-highlight text-danger'
-                        {{action 'removeOption' index}}
+                        class='col ps-2 link-highlight text-danger'
+                        {{on 'click' (fn removeOption index)}}
                       >
                         Verwijderen
                       </a>
-                      <span class='px-3' {{sortable-handle}}>
+                      <span class='col px-3' {{sortable-handle}}>
                         <FaIcon @icon='sort' class='handle text-muted' />
                       </span>
                     </div>
diff --git a/app/templates/articles/article/index.hbs b/app/templates/articles/article/index.hbs
index ec4d0b76d..b5e093631 100644
--- a/app/templates/articles/article/index.hbs
+++ b/app/templates/articles/article/index.hbs
@@ -43,7 +43,7 @@
           />
           <button
             class='btn btn-default'
-            {{action 'submitArticleComment'}}
+            {{on 'click' submitArticleComment}}
             type='button'
           >
             {{t 'tag.button.react'}}
diff --git a/app/templates/books/book/destroy.hbs b/app/templates/books/book/destroy.hbs
index b36e210a5..b0439030a 100644
--- a/app/templates/books/book/destroy.hbs
+++ b/app/templates/books/book/destroy.hbs
@@ -11,10 +11,10 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action this.destroyModel}} class='btn btn-danger' type='button'>
+    <button {{on 'click' this.destroyModel}} class='btn btn-danger' type='button'>
       Boek verwijderen
     </button>
-    <button {{action this.cancel}} type="button" class='btn btn-default'>
+    <button {{on 'click' this.cancel}} type="button" class='btn btn-default'>
       Annuleren
     </button>
   </div>
diff --git a/app/templates/debit/collections/collection/edit.hbs b/app/templates/debit/collections/collection/edit.hbs
index 927b79b51..770b3eb60 100644
--- a/app/templates/debit/collections/collection/edit.hbs
+++ b/app/templates/debit/collections/collection/edit.hbs
@@ -3,7 +3,7 @@
     <h5>{{if @model.isNew 'Incasso aanmaken' 'Incasso wijzigen'}}</h5>
   </div>
   <div class='card-body'>
-    <form {{on 'submit' this.submit}}>
+    <form {{on 'submit' (prevent-default this.submit)}}>
       <ModelForm::TextInput
         @model={{model}}
         @property='name'
@@ -90,7 +90,7 @@
                     <button
                       type='button'
                       class='btn btn-danger'
-                      {{action 'removeTransaction' transaction}}
+                      {{on 'click' (fn removeTransaction transaction)}}
                     >
                       <FaIcon @icon='trash' />
                     </button>
diff --git a/app/templates/debit/collections/new.hbs b/app/templates/debit/collections/new.hbs
index ba07b80fb..f58892757 100644
--- a/app/templates/debit/collections/new.hbs
+++ b/app/templates/debit/collections/new.hbs
@@ -30,7 +30,7 @@
     <br />
     <br />
 
-    <form {{action 'submit' on='submit'}}>
+    <form {{on 'submit' (prevent-default submit)}}>
       <ModelForm::FileInput
         @model={{model}}
         @property='importFile'
diff --git a/app/templates/debit/transactions/transaction/destroy.hbs b/app/templates/debit/transactions/transaction/destroy.hbs
index ba6b2c8b1..2c9bfc3b3 100644
--- a/app/templates/debit/transactions/transaction/destroy.hbs
+++ b/app/templates/debit/transactions/transaction/destroy.hbs
@@ -12,7 +12,7 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <LinkTo
diff --git a/app/templates/form/responses/response/destroy.hbs b/app/templates/form/responses/response/destroy.hbs
index bcf4c25ff..33c581169 100644
--- a/app/templates/form/responses/response/destroy.hbs
+++ b/app/templates/form/responses/response/destroy.hbs
@@ -15,8 +15,8 @@
   </table>
 </div>
 
-<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
-<button {{action 'cancel'}} class="btn btn-default" type="button">Nee</button>
+<button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>Ja</button>
+<button {{on 'click' cancel}} class="btn btn-default" type="button">Nee</button>
 
 {{#if errorMessage}}
   <div class='text-danger'>{{this.errorMessage}}</div>
diff --git a/app/templates/forum/categories/category/destroy.hbs b/app/templates/forum/categories/category/destroy.hbs
index 63c238c93..944c8c4c8 100644
--- a/app/templates/forum/categories/category/destroy.hbs
+++ b/app/templates/forum/categories/category/destroy.hbs
@@ -12,7 +12,7 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <button {{on "click" this.cancel}} class="btn btn-default" type="button">
diff --git a/app/templates/forum/categories/category/threads/thread/destroy.hbs b/app/templates/forum/categories/category/threads/thread/destroy.hbs
index 8f4a951db..d2b7b95dd 100644
--- a/app/templates/forum/categories/category/threads/thread/destroy.hbs
+++ b/app/templates/forum/categories/category/threads/thread/destroy.hbs
@@ -11,7 +11,7 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>
       Ja
     </button>
     <button {{on "click" this.cancel}} class="btn btn-default" type="button">
diff --git a/app/templates/forum/categories/category/threads/thread/posts/index.hbs b/app/templates/forum/categories/category/threads/thread/posts/index.hbs
index a47d186ef..fffd67d14 100644
--- a/app/templates/forum/categories/category/threads/thread/posts/index.hbs
+++ b/app/templates/forum/categories/category/threads/thread/posts/index.hbs
@@ -11,7 +11,7 @@
     {{#unless post.isDeleted}}
       {{forum/forum-post
         post
-        addQuote=(action 'addQuote')
+        addQuote=addQuote
         data-test-forum-post=post.id
       }}
     {{/unless}}
diff --git a/app/templates/groups/group/export.hbs b/app/templates/groups/group/export.hbs
index fcd6a8b5f..bbc615961 100644
--- a/app/templates/groups/group/export.hbs
+++ b/app/templates/groups/group/export.hbs
@@ -51,7 +51,7 @@
         <button
           type='button'
           class='btn btn-primary mb-3'
-          {{action 'exportUsers'}}
+          {{on 'click' exportUsers}}
           disabled={{exportButtonDisabled}}
         >
           Exporteren
diff --git a/app/templates/groups/group/index.hbs b/app/templates/groups/group/index.hbs
index 582d92b9a..d848c97b5 100644
--- a/app/templates/groups/group/index.hbs
+++ b/app/templates/groups/group/index.hbs
@@ -48,7 +48,7 @@
                     class='nav-link
                       {{unless oldMembershipsTabActive "active"}}
                       {{if (eq currentMemberships.length 0) "disabled"}}'
-                    {{action 'hideOldMemberships'}}
+                    {{on 'click' hideOldMemberships}}
                   >
                     Leden
                   </a>
@@ -58,7 +58,7 @@
                     class='nav-link
                       {{if oldMembershipsTabActive "active"}}
                       {{if (eq oldMemberships.length 0) "disabled"}}'
-                    {{action 'showOldMemberships'}}
+                    {{on 'click' showOldMemberships}}
                   >
                     Oud-leden
                   </a>
diff --git a/app/templates/login.hbs b/app/templates/login.hbs
index a80fa2ccf..dfd6feb9d 100644
--- a/app/templates/login.hbs
+++ b/app/templates/login.hbs
@@ -11,7 +11,7 @@
             }}
           </h5>
         </div>
-        <form {{on 'submit' this.authenticate}} method='post'>
+        <form {{on 'submit' (prevent-default this.authenticate)}} method='post'>
           <div class='card-body p-4'>
             {{#if errorMessage}}
               <div class='alert alert-danger' role='alert' data-test-error>
diff --git a/app/templates/mail-aliases/mail-alias/destroy.hbs b/app/templates/mail-aliases/mail-alias/destroy.hbs
index 64bb7743b..8eafc9be3 100644
--- a/app/templates/mail-aliases/mail-alias/destroy.hbs
+++ b/app/templates/mail-aliases/mail-alias/destroy.hbs
@@ -6,8 +6,8 @@
 
     <p>Weet je zeker dat je dit mail-alias ({{@model.email}}) wilt verwijderen?</p>
 
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
-    <button {{action 'cancel'}} class='btn btn-default' type="button">Nee</button>
+    <button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>Ja</button>
+    <button {{on 'click' cancel}} class='btn btn-default' type="button">Nee</button>
 
     {{#if errorMessage}}
       <div class='text-danger'>{{this.errorMessage}}</div>
diff --git a/app/templates/mail-moderations/mail-moderation/accept.hbs b/app/templates/mail-moderations/mail-moderation/accept.hbs
index b87dd72b5..c3515aabf 100644
--- a/app/templates/mail-moderations/mail-moderation/accept.hbs
+++ b/app/templates/mail-moderations/mail-moderation/accept.hbs
@@ -3,7 +3,7 @@
   Er wordt een bericht naar de afzender gestuurd dat dit bericht is goedgekeurd.
 </p>
 
-<button {{action 'submit'}} class='btn btn-danger' type='button'>Ja</button>
+<button {{on 'click' submit}} class='btn btn-danger' type='button'>Ja</button>
 <LinkTo
   @route='mail-moderations.mail-moderation'
   @model={{@model.id}}
diff --git a/app/templates/mail-moderations/mail-moderation/destroy.hbs b/app/templates/mail-moderations/mail-moderation/destroy.hbs
index 016612578..98b6aaf55 100644
--- a/app/templates/mail-moderations/mail-moderation/destroy.hbs
+++ b/app/templates/mail-moderations/mail-moderation/destroy.hbs
@@ -1,7 +1,7 @@
 <p>Weet je zeker dat je deze mail ({{@model.subject}}) wil negeren?</p>
 <p>Er wordt geen bericht gestuurd naar de afzender.</p>
 
-<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+<button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>
   Ja
 </button>
 <LinkTo
diff --git a/app/templates/mail-moderations/mail-moderation/reject.hbs b/app/templates/mail-moderations/mail-moderation/reject.hbs
index 2532314c7..aa1cf7445 100644
--- a/app/templates/mail-moderations/mail-moderation/reject.hbs
+++ b/app/templates/mail-moderations/mail-moderation/reject.hbs
@@ -1,7 +1,7 @@
 <p>Weet je zeker dat je deze mail ({{@model.subject}}) wil afkeuren?</p>
 <p>Er wordt een bericht naar de afzender gestuurd dat dit bericht is afgekeurd.</p>
 
-<button {{action 'submit'}} class='btn btn-danger' type='button'>Ja</button>
+<button {{on 'click' submit}} class='btn btn-danger' type='button'>Ja</button>
 <LinkTo
   @route='mail-moderations.mail-moderation'
   @model={{@model.id}}
diff --git a/app/templates/oauth/authorize.hbs b/app/templates/oauth/authorize.hbs
index 3bb6c23c8..7a279cc35 100644
--- a/app/templates/oauth/authorize.hbs
+++ b/app/templates/oauth/authorize.hbs
@@ -35,7 +35,7 @@
 
             <button
               class='btn btn-primary login-button'
-              {{action 'authorize'}}
+              {{on 'click' authorize}}
               id='button-login'
               type='button'
             >
diff --git a/app/templates/photo-albums/photo-album/destroy.hbs b/app/templates/photo-albums/photo-album/destroy.hbs
index c714ba059..7fefe57d2 100644
--- a/app/templates/photo-albums/photo-album/destroy.hbs
+++ b/app/templates/photo-albums/photo-album/destroy.hbs
@@ -11,10 +11,10 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <button {{action 'cancel'}} class='btn btn-default' type='button'>
+    <button {{on 'click' cancel}} class='btn btn-default' type='button'>
       Annuleren
     </button>
   </div>
diff --git a/app/templates/photo-albums/photo-album/photos/index.hbs b/app/templates/photo-albums/photo-album/photos/index.hbs
index bbab2ce02..c36ee34c8 100644
--- a/app/templates/photo-albums/photo-album/photos/index.hbs
+++ b/app/templates/photo-albums/photo-album/photos/index.hbs
@@ -1,7 +1,7 @@
 <EmberWormhole @to='navbar-wormhole'>
   {{#page-actions-buttons pageActions}}
     <div class='col col-md-auto page-action'>
-      <button class='btn btn-primary' {{action 'downloadAlbum'}} type='button'>
+      <button class='btn btn-primary' {{on 'click' downloadAlbum}} type='button'>
         <FaIcon @icon='download' />
         <span class='d-none d-md-inline'>Fotoalbum downloaden</span>
       </button>
diff --git a/app/templates/photo-albums/photo-album/photos/photo/destroy.hbs b/app/templates/photo-albums/photo-album/photos/photo/destroy.hbs
index 124993acb..5d41c000b 100644
--- a/app/templates/photo-albums/photo-album/photos/photo/destroy.hbs
+++ b/app/templates/photo-albums/photo-album/photos/photo/destroy.hbs
@@ -13,7 +13,7 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
     <LinkTo
diff --git a/app/templates/photo-albums/photo-album/photos/photo/index.hbs b/app/templates/photo-albums/photo-album/photos/photo/index.hbs
index ea04dfc7b..0b1f5ba05 100644
--- a/app/templates/photo-albums/photo-album/photos/photo/index.hbs
+++ b/app/templates/photo-albums/photo-album/photos/photo/index.hbs
@@ -3,14 +3,14 @@
     <div class='col col-md-auto page-action'>
       <button
         class='btn btn-primary'
-        {{action 'goToPreviousPhoto'}}
+        {{on 'click' goToPreviousPhoto}}
         type='button'
       >
         <FaIcon @icon='arrow-left' />
       </button>
     </div>
     <div class='col col-md-auto page-action'>
-      <button class='btn btn-primary' {{action 'goToNextPhoto'}} type='button'>
+      <button class='btn btn-primary' {{on 'click' goToNextPhoto}} type='button'>
         <FaIcon @icon='arrow-right' />
       </button>
     </div>
diff --git a/app/templates/polls/poll/destroy.hbs b/app/templates/polls/poll/destroy.hbs
index 47d043c82..326629200 100644
--- a/app/templates/polls/poll/destroy.hbs
+++ b/app/templates/polls/poll/destroy.hbs
@@ -8,7 +8,7 @@
       verwijderen?
     </p>
 
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
+    <button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>Ja</button>
     <LinkTo
       @route='polls.poll'
       @model={{model.id}}
diff --git a/app/templates/polls/poll/index.hbs b/app/templates/polls/poll/index.hbs
index 81b0ad884..705a739d5 100644
--- a/app/templates/polls/poll/index.hbs
+++ b/app/templates/polls/poll/index.hbs
@@ -65,8 +65,8 @@
 
   <div class='card-body p-3'>
     {{#if @model.form.currentUserCanRespond}}
-      <form {{action 'submitResponse' on='submit'}}>
-        {{form/response/response-form @model.form @model.currentUserResponse}}
+      <form {{on 'submit' (prevent-default submitResponse)}}>
+        <Form::Response::ResponseForm @form={{@model.form}} @response={{@model.currentUserResponse}} />
         <ModelForm::FormActions
           @errors={{form.errors}}
           @errorMessage={{this.errorMessage}}
diff --git a/app/templates/room-adverts/room-advert/edit.hbs b/app/templates/room-adverts/room-advert/edit.hbs
index 40ca7c5c7..5f877bb15 100644
--- a/app/templates/room-adverts/room-advert/edit.hbs
+++ b/app/templates/room-adverts/room-advert/edit.hbs
@@ -7,6 +7,6 @@
   @errorMessage={{this.errorMessage}}
   @onSubmit={{this.submit}}
   @onCancel={{this.cancel}}
-  @onCoverPhotoLoaded={{action this.coverPhotoLoaded}}
+  @onCoverPhotoLoaded={{this.coverPhotoLoaded}}
   @groups={{this.groups}}
 />
\ No newline at end of file
diff --git a/app/templates/sog/name-trainer.hbs b/app/templates/sog/name-trainer.hbs
index 31f921c23..7f6e29e9c 100644
--- a/app/templates/sog/name-trainer.hbs
+++ b/app/templates/sog/name-trainer.hbs
@@ -40,7 +40,7 @@
                     (and answered (eq this.currentQuestion.question opt))
                     "bg-success"
                   }}'
-                {{action 'chooseOption' opt}}
+                {{on 'click' (fn chooseOption opt)}}
               >
                 <img
                   class='card-img-rounded'
@@ -66,7 +66,7 @@
                     (and answered (eq this.currentQuestion.question opt))
                     "bg-success"
                   }}'
-                {{action 'chooseOption' opt}}
+                {{on 'click' (fn chooseOption opt)}}
               >
                 {{opt.fullNameWithNickname}}
               </li>
@@ -101,7 +101,7 @@
               <button
                 type='button'
                 class='btn btn-primary'
-                {{action 'checkAnswer'}}
+                {{on 'click' checkAnswer}}
               >
                 Antwoord
               </button>
@@ -110,7 +110,7 @@
         {{/if}}
 
         <div class='card-footer text-end'>
-          <a class='btn btn-default' {{action 'stopTrainer'}}>Stoppen</a>
+          <a class='btn btn-default' {{on 'click' stopTrainer}}>Stoppen</a>
         </div>
       {{/if}}
 
@@ -201,7 +201,7 @@
       </div>
 
       <div class='card-footer text-end'>
-        <a class='btn btn-default' {{action 'stopTrainer'}}>
+        <a class='btn btn-default' {{on 'click' stopTrainer}}>
           Terug naar instellingen
         </a>
       </div>
@@ -238,7 +238,7 @@
         </div>
       </div>
       <div class='card-footer text-end'>
-        <a class='btn btn-primary' {{action 'startTrainer'}}>Starten</a>
+        <a class='btn btn-primary' {{on 'click' startTrainer}}>Starten</a>
       </div>
     {{/if}}
   </div>
diff --git a/app/templates/static-pages/static-page/destroy.hbs b/app/templates/static-pages/static-page/destroy.hbs
index 6120d52b0..2aa6cfcc8 100644
--- a/app/templates/static-pages/static-page/destroy.hbs
+++ b/app/templates/static-pages/static-page/destroy.hbs
@@ -1,7 +1,7 @@
 <p>Weet je zeker dat je deze informatie pagina wilt verwijderen?</p>
 
-<button {{action 'destroyModel'}} class='btn btn-danger' type='button'>Ja</button>
-<button {{action 'cancel'}} class="btn btn-default" type="button">Nee</button>
+<button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>Ja</button>
+<button {{on 'click' cancel}} class="btn btn-default" type="button">Nee</button>
 
 {{#if errorMessage}}
   <div class='text-danger'>{{this.errorMessage}}</div>
diff --git a/app/templates/users/activate-account.hbs b/app/templates/users/activate-account.hbs
index 56c131c3f..d599a726e 100644
--- a/app/templates/users/activate-account.hbs
+++ b/app/templates/users/activate-account.hbs
@@ -1,7 +1,7 @@
 <div class='row'>
   <div class='col-md-6 offset-md-3 login-form-holder'>
     <div class='card login-form'>
-      <form {{action 'resetPassword' on='submit'}}>
+      <form {{on 'submit' (prevent-default resetPassword)}}>
         <div class='card-body'>
           <h4 class='card-title'>Account activeren</h4>
           {{#if this.successMessage}}
diff --git a/app/templates/users/batch/new.hbs b/app/templates/users/batch/new.hbs
index 731da8d5f..2c6c16b1d 100644
--- a/app/templates/users/batch/new.hbs
+++ b/app/templates/users/batch/new.hbs
@@ -26,7 +26,7 @@
 
     <hr />
 
-    <form {{action 'uploadFile' on='submit'}}>
+    <form {{on 'submit' (prevent-default uploadFile)}}>
       <ModelForm::FileInput
         @model={{model}}
         @property='importFile'
@@ -43,7 +43,7 @@
           <PowerSelect
             @selected={{addToGroup}}
             @options={{groups}}
-            @onChange={{action (mut addToGroup)}}
+            @onChange={{fn (mut addToGroup)}}
             @searchEnabled={{true}}
             @searchField='name'
             @allowClear={{true}}
@@ -116,7 +116,7 @@
         <button
           type='button'
           class='btn btn-secondary btn-inline ms-3'
-          {{action 'confirmUpload'}}
+          {{on 'click' confirmUpload}}
           name='confirmUpload'
           disabled={{if importErrors true false}}
         >
diff --git a/app/templates/users/forgot-password.hbs b/app/templates/users/forgot-password.hbs
index b4e5926e0..f88deac4c 100644
--- a/app/templates/users/forgot-password.hbs
+++ b/app/templates/users/forgot-password.hbs
@@ -2,7 +2,7 @@
   <div class='d-flex justify-content-center'>
     <div class='col-12 col-md-6 col-lg-4'>
       <div class='card login-form'>
-        <form {{action 'forgotPassword' on='submit'}}>
+        <form {{on 'submit' (prevent-default forgotPassword)}}>
           <div class='card-header'>
             <h5 class='card-title ps-2'>
               {{t 'template.users.forgotPassword.recoverPassword'}}
diff --git a/app/templates/users/user/destroy.hbs b/app/templates/users/user/destroy.hbs
index edc592a5a..6c294fe86 100644
--- a/app/templates/users/user/destroy.hbs
+++ b/app/templates/users/user/destroy.hbs
@@ -12,10 +12,10 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action 'destroyModel'}} class='btn btn-danger' type='button'>
+    <button {{on 'click' destroyModel}} class='btn btn-danger' type='button'>
       Verwijderen
     </button>
-    <button {{action 'cancel'}} class="btn btn-default" type="button">Annuleren</button>
+    <button {{on 'click' cancel}} class="btn btn-default" type="button">Annuleren</button>
   </div>
 </div>
 
diff --git a/app/templates/users/user/edit/permissions.hbs b/app/templates/users/user/edit/permissions.hbs
index 9ab1edc6b..ac12b3df6 100644
--- a/app/templates/users/user/edit/permissions.hbs
+++ b/app/templates/users/user/edit/permissions.hbs
@@ -1,5 +1,5 @@
 <TabbedView @tabItems={{this.tabItems}}>
-  <form class='form' {{action 'submit' on='submit'}}>
+  <form class='form' {{on 'submit' (prevent-default submit)}}>
     <h5>Permissies</h5>
     <Permissions::PermissionsTable
       @modelPermissions={{@model.userPermissions}}
@@ -12,7 +12,7 @@
       @inputLayout='vertical'
     >
       <button
-        {{action 'cancel'}}
+        {{on 'click' cancel}}
         type="button"
         class='btn btn-default'
       >
diff --git a/app/templates/users/user/edit/privacy.hbs b/app/templates/users/user/edit/privacy.hbs
index 25a426c94..573db83a8 100644
--- a/app/templates/users/user/edit/privacy.hbs
+++ b/app/templates/users/user/edit/privacy.hbs
@@ -1,3 +1,3 @@
 <TabbedView @tabItems={{this.tabItems}}>
-  <Users::PrivacySettings @model={{model}} @onSubmit={{action 'submit'}} @onCancel={{action 'cancel'}}/>
+  <Users::PrivacySettings @model={{model}} @onSubmit={{submit}} @onCancel={{cancel}}/>
 </TabbedView>
\ No newline at end of file
diff --git a/app/templates/users/user/groups.hbs b/app/templates/users/user/groups.hbs
index 7f37c01d1..489d6372b 100644
--- a/app/templates/users/user/groups.hbs
+++ b/app/templates/users/user/groups.hbs
@@ -11,7 +11,7 @@
             class='nav-link
               {{unless oldMembershipsTabActive "active"}}
               {{if (eq currentMemberships.length 0) "disabled"}}'
-            {{action 'hideOldMemberships'}}
+            {{on 'click' hideOldMemberships}}
           >
             Huidige groepen
           </a>
@@ -21,7 +21,7 @@
             class='nav-link
               {{if oldMembershipsTabActive "active"}}
               {{if (eq oldMemberships.length 0) "disabled"}}'
-            {{action 'showOldMemberships'}}
+            {{on 'click' showOldMemberships}}
           >
             Voorheen
           </a>
diff --git a/app/templates/users/user/resend-activation-code.hbs b/app/templates/users/user/resend-activation-code.hbs
index 7d856bf32..51f62a426 100644
--- a/app/templates/users/user/resend-activation-code.hbs
+++ b/app/templates/users/user/resend-activation-code.hbs
@@ -4,7 +4,7 @@
   opnieuw wil versturen? Dit zal de oude activatiecode ongeldig maken.
 </p>
 
-<button {{action 'resendActivationCode'}} class='btn btn-danger' type='button'>
+<button {{on 'click' resendActivationCode}} class='btn btn-danger' type='button'>
   Ja
 </button>
 <LinkTo @route='users.user' @model={{@model.id}} class='btn btn-default'>
diff --git a/app/templates/users/webdav.hbs b/app/templates/users/webdav.hbs
index 07fd1d50b..cd02fe291 100644
--- a/app/templates/users/webdav.hbs
+++ b/app/templates/users/webdav.hbs
@@ -49,7 +49,7 @@
 
             <button
               class='btn btn-primary'
-              {{action 'generateWebdavSecret'}}
+              {{on 'click' generateWebdavSecret}}
               type='button'
             >
               Contactsynchronisatie activeren
diff --git a/app/templates/vacancies/new.hbs b/app/templates/vacancies/new.hbs
index 9ab42e150..182f8ecbb 100644
--- a/app/templates/vacancies/new.hbs
+++ b/app/templates/vacancies/new.hbs
@@ -1,8 +1,8 @@
 <Forms::VacancyForm
   @model={{@model}}
   @errorMessage={{this.errorMessage}}
-  @onSubmit={{action 'submit'}}
+  @onSubmit={{submit}}
   @onCancel={{this.cancel}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onCoverPhotoLoaded={{coverPhotoLoaded}}
   @groups={{this.groups}}
 />
\ No newline at end of file
diff --git a/app/templates/vacancies/vacancy/destroy.hbs b/app/templates/vacancies/vacancy/destroy.hbs
index f984df029..6d4cf8638 100644
--- a/app/templates/vacancies/vacancy/destroy.hbs
+++ b/app/templates/vacancies/vacancy/destroy.hbs
@@ -11,10 +11,10 @@
     {{/if}}
   </div>
   <div class='card-footer'>
-    <button {{action this.destroyModel}} class='btn btn-danger' type='button'>
+    <button {{on 'click' this.destroyModel}} class='btn btn-danger' type='button'>
       Vacature verwijderen
     </button>
-    <button {{action this.cancel}} type="button" class='btn btn-default'>
+    <button {{on 'click' this.cancel}} type="button" class='btn btn-default'>
       Annuleren
     </button>
   </div>
diff --git a/app/templates/vacancies/vacancy/edit.hbs b/app/templates/vacancies/vacancy/edit.hbs
index 36c0bc587..214f6690c 100644
--- a/app/templates/vacancies/vacancy/edit.hbs
+++ b/app/templates/vacancies/vacancy/edit.hbs
@@ -5,8 +5,8 @@
 <Forms::VacancyForm
   @model={{@model}}
   @errorMessage={{this.errorMessage}}
-  @onSubmit={{action 'submit'}}
+  @onSubmit={{submit}}
   @onCancel={{this.cancel}}
-  @onCoverPhotoLoaded={{action 'coverPhotoLoaded'}}
+  @onCoverPhotoLoaded={{coverPhotoLoaded}}
   @groups={{this.groups}}
 />
\ No newline at end of file