diff --git a/.template-lintrc.js b/.template-lintrc.js
index 37ed66d..0a65960 100644
--- a/.template-lintrc.js
+++ b/.template-lintrc.js
@@ -3,7 +3,6 @@
 module.exports = {
   extends: 'recommended',
   rules: {
-    'no-action': false,
     'no-implicit-this': {
       allow: ['scroll-first-invalid-element-into-view-port'],
     },
diff --git a/app/controllers/poll/participation.js b/app/controllers/poll/participation.js
index 3e6adb8..d8701e7 100644
--- a/app/controllers/poll/participation.js
+++ b/app/controllers/poll/participation.js
@@ -70,4 +70,9 @@ export default class PollParticipationController extends Controller {
       queryParams: { encryptionKey },
     });
   }
+
+  @action
+  resetSavingStatus() {
+    this.savingFailed = false;
+  }
 }
diff --git a/app/templates/create/meta.hbs b/app/templates/create/meta.hbs
index fde9468..5c8483e 100644
--- a/app/templates/create/meta.hbs
+++ b/app/templates/create/meta.hbs
@@ -38,7 +38,7 @@
         <NextButton />
       </div>
       <div class="col-6 col-md-4 order-1 text-right">
-        <BackButton @onClick={{action "previousPage"}} />
+        <BackButton @onClick={{this.previousPage}} />
       </div>
     </div>
   </BsForm>
diff --git a/app/templates/create/settings.hbs b/app/templates/create/settings.hbs
index 2916914..bb253b5 100644
--- a/app/templates/create/settings.hbs
+++ b/app/templates/create/settings.hbs
@@ -18,7 +18,7 @@
       <select
         id={{el.id}}
         class="custom-select"
-        {{on "change" (action el.setValue value="target.value")}}
+        {{on "change" (pick "target.value" el.setValue)}}
         {{autofocus}}
       >
         {{#each this.answerTypes as |answerType|}}
@@ -75,7 +75,7 @@
         />
       </div>
       <div class="col-6 col-md-4 order-1 text-right">
-        <BackButton @onClick={{action "previousPage"}} />
+        <BackButton @onClick={{this.previousPage}} />
       </div>
     </div>
   </BsForm>
diff --git a/app/templates/poll/participation.hbs b/app/templates/poll/participation.hbs
index 07d5673..9d072dc 100644
--- a/app/templates/poll/participation.hbs
+++ b/app/templates/poll/participation.hbs
@@ -131,7 +131,7 @@
 </div>
 
 <BsModal
-  @onHidden={{action (mut this.savingFailed) false}}
+  @onHidden={{this.resetSavingStatus}}
   @onSubmit={{this.save}}
   @open={{this.savingFailed}}
   data-test-modal="saving-failed"