diff --git a/app/components/form/response/response-form.hbs b/app/components/form/response/response-form.hbs
index acfd0b027..08ffae72b 100644
--- a/app/components/form/response/response-form.hbs
+++ b/app/components/form/response/response-form.hbs
@@ -7,7 +7,7 @@
     {{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/forms/activity-form.hbs b/app/components/forms/activity-form.hbs
index 3cdfca295..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'
         >
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/users/otp-settings.hbs b/app/components/users/otp-settings.hbs
index e3eec6348..67b8310b7 100644
--- a/app/components/users/otp-settings.hbs
+++ b/app/components/users/otp-settings.hbs
@@ -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>
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/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/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/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/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/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/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 5a8e073ef..705a739d5 100644
--- a/app/templates/polls/poll/index.hbs
+++ b/app/templates/polls/poll/index.hbs
@@ -65,7 +65,7 @@
 
   <div class='card-body p-3'>
     {{#if @model.form.currentUserCanRespond}}
-      <form {{action 'submitResponse' on='submit'}}>
+      <form {{on 'submit' (prevent-default submitResponse)}}>
         <Form::Response::ResponseForm @form={{@model.form}} @response={{@model.currentUserResponse}} />
         <ModelForm::FormActions
           @errors={{form.errors}}
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..320313e77 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}}
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/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/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>