diff --git a/app/assets/javascripts/admin/templates/api.hbs b/app/assets/javascripts/admin/templates/api.hbs
index 1b82d7618..3807e1e68 100644
--- a/app/assets/javascripts/admin/templates/api.hbs
+++ b/app/assets/javascripts/admin/templates/api.hbs
@@ -18,8 +18,8 @@
         {{/if}}
       </td>
       <td>
-        <button class='btn' {{action regenerateKey this}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</button>
-        <button class='btn' {{action revokeKey this}}><i class="fa fa-times"></i>{{i18n admin.api.revoke}}</button>
+        <button class='btn' {{action "regenerateKey" this}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</button>
+        <button class='btn' {{action "revokeKey" this}}><i class="fa fa-times"></i>{{i18n admin.api.revoke}}</button>
       </td>
     </tr>
   {{/each}}
@@ -29,5 +29,5 @@
 {{/if}}
 
 {{#unless hasMasterKey}}
-  <button class='btn' {{action generateMasterKey}}><i class="fa fa-key"></i>{{i18n admin.api.generate_master}}</button>
+  <button class='btn' {{action "generateMasterKey"}}><i class="fa fa-key"></i>{{i18n admin.api.generate_master}}</button>
 {{/unless }}
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index 87a7e5ca6..3ccbfce80 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -7,12 +7,12 @@
   </div>
   <div class="pull-right">
     {{#if canRollback}}
-      <button {{action rollback}} class="btn btn-rollback" title="{{i18n admin.backups.operations.rollback.title}}" {{bind-attr disabled="rollbackDisabled"}}><i class="fa fa-ambulance fa-flip-horizontal"></i>{{i18n admin.backups.operations.rollback.text}}</button>
+      <button {{action "rollback"}} class="btn btn-rollback" title="{{i18n admin.backups.operations.rollback.title}}" {{bind-attr disabled="rollbackDisabled"}}><i class="fa fa-ambulance fa-flip-horizontal"></i>{{i18n admin.backups.operations.rollback.text}}</button>
     {{/if}}
     {{#if isOperationRunning}}
-      <button {{action cancelOperation}} class="btn btn-danger" title="{{i18n admin.backups.operations.cancel.title}}"><i class="fa fa-times"></i>{{i18n admin.backups.operations.cancel.text}}</button>
+      <button {{action "cancelOperation"}} class="btn btn-danger" title="{{i18n admin.backups.operations.cancel.title}}"><i class="fa fa-times"></i>{{i18n admin.backups.operations.cancel.text}}</button>
     {{else}}
-      <button {{action startBackup}} class="btn btn-primary" title="{{i18n admin.backups.operations.backup.title}}"><i class="fa fa-rocket"></i>{{i18n admin.backups.operations.backup.text}}</button>
+      <button {{action "startBackup"}} class="btn btn-primary" title="{{i18n admin.backups.operations.backup.title}}"><i class="fa fa-rocket"></i>{{i18n admin.backups.operations.backup.text}}</button>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups_index.hbs
index 4ae94dd38..a177bfec4 100644
--- a/app/assets/javascripts/admin/templates/backups_index.hbs
+++ b/app/assets/javascripts/admin/templates/backups_index.hbs
@@ -5,7 +5,7 @@
     <th>
       <div class="pull-right">
         {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}}
-        <button {{action toggleReadOnlyMode}} class="btn" {{bind-attr disabled="readOnlyModeDisabled" title="readOnlyModeTitle"}}><i class="fa fa-eye"></i>{{readOnlyModeText}}</button>
+        <button {{action "toggleReadOnlyMode"}} class="btn" {{bind-attr disabled="readOnlyModeDisabled" title="readOnlyModeTitle"}}><i class="fa fa-eye"></i>{{readOnlyModeText}}</button>
       </div>
     </th>
   </tr>
@@ -16,8 +16,8 @@
       <td>
         <div class="pull-right">
           <a {{bind-attr href="backup.link"}} class="btn download" title="{{i18n admin.backups.operations.download.title}}"><i class="fa fa-download"></i>{{i18n admin.backups.operations.download.text}}</a>
-          <button {{action destroyBackup backup}} class="btn btn-danger" {{bind-attr disabled="destroyDisabled" title="destroyTitle"}}><i class="fa fa-trash-o"></i></button>
-          <button {{action startRestore backup}} class="btn" {{bind-attr disabled="restoreDisabled" title="restoreTitle"}}><i class="fa fa-play"></i>{{i18n admin.backups.operations.restore.text}}</button>
+          <button {{action "destroyBackup" backup}} class="btn btn-danger" {{bind-attr disabled="destroyDisabled" title="destroyTitle"}}><i class="fa fa-trash-o"></i></button>
+          <button {{action "startRestore" backup}} class="btn" {{bind-attr disabled="restoreDisabled" title="restoreTitle"}}><i class="fa fa-play"></i>{{i18n admin.backups.operations.restore.text}}</button>
         </div>
       </td>
     </tr>
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs
index 1f0a42725..b0375f689 100644
--- a/app/assets/javascripts/admin/templates/badges.hbs
+++ b/app/assets/javascripts/admin/templates/badges.hbs
@@ -5,7 +5,7 @@
     <ul>
       {{#each}}
       <li>
-        <a {{action selectBadge this}} {{bind-attr class="selected:active"}}>
+        <a {{action "selectBadge" this}} {{bind-attr class="selected:active"}}>
         <span {{bind-attr class=":user-badge badgeTypeClassName" data-badge-name="name" title="displayDescription"}}>
           <i {{bind-attr class=":fa icon"}}></i>
           {{displayName}}
@@ -17,7 +17,7 @@
       </li>
       {{/each}}
     </ul>
-    <button {{action createNewBadge}} {{bind-attr disabled=newBadgeExists}} class='btn'><i class="fa fa-plus"></i>{{i18n admin.badges.new}}</button>
+    <button {{action "createNewBadge"}} {{bind-attr disabled=newBadgeExists}} class='btn'><i class="fa fa-plus"></i>{{i18n admin.badges.new}}</button>
   </div>
 
   {{#if selectedItem}}
@@ -56,7 +56,7 @@
                             content=controller.badgeGroupings
                             optionValuePath="content.id"
                             optionLabelPath="content.name"}}
-        &nbsp;<button {{action editGroupings controller.badgeGroupings}}><i class="fa fa-pencil"></i></button>
+        &nbsp;<button {{action "editGroupings" controller.badgeGroupings}}><i class="fa fa-pencil"></i></button>
       </div>
 
 
@@ -76,9 +76,9 @@
 
       {{#if hasQuery}}
 
-      <a href {{action preview this "false"}}>{{i18n admin.badges.preview.link_text}}</a>
+      <a href {{action "preview" this "false"}}>{{i18n admin.badges.preview.link_text}}</a>
       |
-      <a href {{action preview this "true"}}>{{i18n admin.badges.preview.plan_text}}</a>
+      <a href {{action "preview" this "true"}}>{{i18n admin.badges.preview.plan_text}}</a>
       {{#if preview_loading}}
         {{i18n loading}}...
       {{/if}}
@@ -144,10 +144,10 @@
       </div>
 
       <div class='buttons'>
-        <button {{action save}} {{bind-attr disabled=controller.disableSave}} class='btn btn-primary'>{{i18n admin.badges.save}}</button>
+        <button {{action "save"}} {{bind-attr disabled=controller.disableSave}} class='btn btn-primary'>{{i18n admin.badges.save}}</button>
         <span class='saving'>{{savingStatus}}</span>
         {{#unless readOnly}}
-          <a {{action destroy}} class='delete-link'>{{i18n admin.badges.delete}}</a>
+          <a {{action "destroy"}} class='delete-link'>{{i18n admin.badges.delete}}</a>
         {{/unless}}
       </div>
     </form>
diff --git a/app/assets/javascripts/admin/templates/customize_colors.hbs b/app/assets/javascripts/admin/templates/customize_colors.hbs
index ef0b75ed5..2f35d97e3 100644
--- a/app/assets/javascripts/admin/templates/customize_colors.hbs
+++ b/app/assets/javascripts/admin/templates/customize_colors.hbs
@@ -3,11 +3,11 @@
   <ul>
     {{#each model}}
       {{#unless is_base}}
-        <li><a {{action selectColorScheme this}} {{bind-attr class="selected:active"}}>{{description}}</a></li>
+        <li><a {{action "selectColorScheme" this}} {{bind-attr class="selected:active"}}>{{description}}</a></li>
       {{/unless}}
     {{/each}}
   </ul>
-  <button {{action newColorScheme}} class='btn'><i class="fa fa-plus"></i>{{i18n admin.customize.new}}</button>
+  <button {{action "newColorScheme"}} class='btn'><i class="fa fa-plus"></i>{{i18n admin.customize.new}}</button>
 </div>
 
 {{#if selectedItem}}
@@ -17,16 +17,16 @@
         <h1>{{text-field class="style-name" value=name}}</h1>
 
         <div class="controls">
-          <button {{action save}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
-          <button {{action toggleEnabled}} {{bind-attr disabled="disableEnable"}} class="btn">
+          <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+          <button {{action "toggleEnabled"}} {{bind-attr disabled="disableEnable"}} class="btn">
             {{#if enabled}}
               {{i18n disable}}
             {{else}}
               {{i18n enable}}
             {{/if}}
           </button>
-          <button {{action copy this}} class='btn'><i class="fa fa-copy"></i> {{i18n admin.customize.copy}}</button>
-          <button {{action destroy}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n admin.customize.delete}}</button>
+          <button {{action "copy" this}} class='btn'><i class="fa fa-copy"></i> {{i18n admin.customize.copy}}</button>
+          <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n admin.customize.delete}}</button>
           <span {{bind-attr class=":saving savingStatus::hidden" }}>{{savingStatus}}</span>
         </div>
       {{/with}}
@@ -61,8 +61,8 @@
               </td>
               <td class="hex">{{color-input hexValue=hex brightnessValue=brightness valid=valid}}</td>
               <td class="actions">
-                <button {{bind-attr class=":btn :revert savedIsOverriden::invisible"}} {{action revert this}} title="{{i18n admin.customize.colors.revert_title}}">{{i18n revert}}</button>
-                <button {{bind-attr class=":btn :undo changed::invisible"}} {{action undo this}} title="{{i18n admin.customize.colors.undo_title}}">{{i18n undo}}</button>
+                <button {{bind-attr class=":btn :revert savedIsOverriden::invisible"}} {{action "revert" this}} title="{{i18n admin.customize.colors.revert_title}}">{{i18n revert}}</button>
+                <button {{bind-attr class=":btn :undo changed::invisible"}} {{action "undo" this}} title="{{i18n admin.customize.colors.undo_title}}">{{i18n undo}}</button>
               </td>
             </tr>
           {{/each}}
@@ -77,4 +77,4 @@
   <p class="about">{{i18n admin.customize.colors.about}}</p>
 {{/if}}
 
-<div class="clearfix"></div>
\ No newline at end of file
+<div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/customize_css_html.hbs b/app/assets/javascripts/admin/templates/customize_css_html.hbs
index 879ca8aaf..c9c6e36d1 100644
--- a/app/assets/javascripts/admin/templates/customize_css_html.hbs
+++ b/app/assets/javascripts/admin/templates/customize_css_html.hbs
@@ -2,10 +2,10 @@
   <h3>{{i18n admin.customize.css_html.long_title}}</h3>
   <ul>
     {{#each model}}
-    <li><a {{action selectStyle this}} {{bind-attr class="this.selected:active"}}>{{this.description}}</a></li>
+    <li><a {{action "selectStyle" this}} {{bind-attr class="this.selected:active"}}>{{this.description}}</a></li>
     {{/each}}
   </ul>
-  <button {{action newCustomization}} class='btn'><i class="fa fa-plus"></i>{{i18n admin.customize.new}}</button>
+  <button {{action "newCustomization"}} class='btn'><i class="fa fa-plus"></i>{{i18n admin.customize.new}}</button>
 </div>
 
 
@@ -17,16 +17,16 @@
     <div class='admin-controls'>
       <ul class="nav nav-pills">
         <li>
-          <a {{bind-attr class="view.stylesheetActive:active"}}{{action selectStylesheet href="true" target="view"}}>{{i18n admin.customize.css}}</a>
+          <a {{bind-attr class="view.stylesheetActive:active"}}{{action "selectStylesheet" href="true" target="view"}}>{{i18n admin.customize.css}}</a>
         </li>
         <li>
-          <a {{bind-attr class="view.headerActive:active"}}{{action selectHeader href="true" target="view"}}>{{i18n admin.customize.header}}</a>
+          <a {{bind-attr class="view.headerActive:active"}}{{action "selectHeader" href="true" target="view"}}>{{i18n admin.customize.header}}</a>
         </li>
         <li>
-          <a {{bind-attr class="view.mobileStylesheetActive:active"}}{{action selectMobileStylesheet href="true" target="view"}}>{{i18n admin.customize.mobile_css}}</a>
+          <a {{bind-attr class="view.mobileStylesheetActive:active"}}{{action "selectMobileStylesheet" href="true" target="view"}}>{{i18n admin.customize.mobile_css}}</a>
         </li>
         <li>
-          <a {{bind-attr class="view.mobileHeaderActive:active"}}{{action selectMobileHeader href="true" target="view"}}>{{i18n admin.customize.mobile_header}}</a>
+          <a {{bind-attr class="view.mobileHeaderActive:active"}}{{action "selectMobileHeader" href="true" target="view"}}>{{i18n admin.customize.mobile_header}}</a>
         </li>
       </ul>
     </div>
@@ -60,9 +60,9 @@
   </div>
 
   <div class='buttons'>
-    <button {{action save}} {{bind-attr disabled="selectedItem.disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+    <button {{action "save"}} {{bind-attr disabled="selectedItem.disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
     <span class='saving'>{{selectedItem.savingStatus}}</span>
-    <a {{action destroy}} class='delete-link'>{{i18n admin.customize.delete}}</a>
+    <a {{action "destroy"}} class='delete-link'>{{i18n admin.customize.delete}}</a>
   </div>
 
 </div>
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 99421f9f2..cb597d1cd 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -119,7 +119,7 @@
         </p>
         <p class="actions">
           <small>{{i18n admin.dashboard.last_checked}}: {{problemsTimestamp}}</small>
-          <button {{action refreshProblems}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+          <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
         </p>
       </div>
       <div class="clearfix"></div>
@@ -131,7 +131,7 @@
         <div class="problem-messages">
           <p>
             {{i18n admin.dashboard.no_problems}}
-            <button {{action refreshProblems}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+            <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
           </p>
         </div>
         <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/email_index.hbs b/app/assets/javascripts/admin/templates/email_index.hbs
index 8a5de6b4f..461435534 100644
--- a/app/assets/javascripts/admin/templates/email_index.hbs
+++ b/app/assets/javascripts/admin/templates/email_index.hbs
@@ -20,7 +20,7 @@
     {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
   </div>
   <div class='span10 controls'>
-    <button class='btn btn-primary' {{action sendTestEmail}} {{bind-attr disabled="sendTestEmailDisabled"}}>{{i18n admin.email.send_test}}</button>
+    <button class='btn btn-primary' {{action "sendTestEmail"}} {{bind-attr disabled="sendTestEmailDisabled"}}>{{i18n admin.email.send_test}}</button>
     {{#if sentTestEmail}}<span class='result-message'>{{i18n admin.email.sent_test}}</span>{{/if}}
   </div>
   {{/if}}
diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.hbs b/app/assets/javascripts/admin/templates/email_preview_digest.hbs
index 52483a5ad..dc3b946a8 100644
--- a/app/assets/javascripts/admin/templates/email_preview_digest.hbs
+++ b/app/assets/javascripts/admin/templates/email_preview_digest.hbs
@@ -6,14 +6,14 @@
     {{input type="date" value=lastSeen id="last-seen"}}
   </div>
   <div>
-    <button class='btn' {{action refresh}}>{{i18n admin.email.refresh}}</button>
+    <button class='btn' {{action "refresh"}}>{{i18n admin.email.refresh}}</button>
   </div>
   <div class="span7 toggle">
     <label>{{i18n admin.email.format}}</label>
     {{#if showHtml}}
-      <span>{{i18n admin.email.html}}</span> | <a href='#' {{action toggleShowHtml}}>{{i18n admin.email.text}}</a>
+      <span>{{i18n admin.email.html}}</span> | <a href='#' {{action "toggleShowHtml"}}>{{i18n admin.email.text}}</a>
     {{else}}
-      <a href='#' {{action toggleShowHtml}}>{{i18n admin.email.html}}</a> | <span>{{i18n admin.email.text}}</span>
+      <a href='#' {{action "toggleShowHtml"}}>{{i18n admin.email.html}}</a> | <span>{{i18n admin.email.text}}</span>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/flags.hbs b/app/assets/javascripts/admin/templates/flags.hbs
index bbad7f00a..87a1af655 100644
--- a/app/assets/javascripts/admin/templates/flags.hbs
+++ b/app/assets/javascripts/admin/templates/flags.hbs
@@ -143,14 +143,14 @@
             <tr>
               <td colspan="4" class="action">
                 {{#if adminActiveFlagsView}}
-                  <button title='{{i18n admin.flags.agree_title}}' class='btn' {{action showAgreeFlagModal flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree}}&hellip;</button>
+                  <button title='{{i18n admin.flags.agree_title}}' class='btn' {{action "showAgreeFlagModal" flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree}}&hellip;</button>
                   {{#if flaggedPost.postHidden}}
-                    <button title='{{i18n admin.flags.disagree_flag_unhide_post_title}}' class='btn' {{action disagreeFlags flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag_unhide_post}}</button>
+                    <button title='{{i18n admin.flags.disagree_flag_unhide_post_title}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag_unhide_post}}</button>
                   {{else}}
-                    <button title='{{i18n admin.flags.disagree_flag_title}}' class='btn' {{action disagreeFlags flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag}}</button>
+                    <button title='{{i18n admin.flags.disagree_flag_title}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag}}</button>
                   {{/if}}
-                  <button title='{{i18n admin.flags.defer_flag_title}}' class='btn' {{action deferFlags flaggedPost}}><i class="fa fa-external-link"></i>{{i18n admin.flags.defer_flag}}</button>
-                  <button title='{{i18n admin.flags.delete_title}}' class='btn btn-danger' {{action showDeleteFlagModal flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n admin.flags.delete}}&hellip;</button>
+                  <button title='{{i18n admin.flags.defer_flag_title}}' class='btn' {{action "deferFlags" flaggedPost}}><i class="fa fa-external-link"></i>{{i18n admin.flags.defer_flag}}</button>
+                  <button title='{{i18n admin.flags.delete_title}}' class='btn btn-danger' {{action "showDeleteFlagModal" flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n admin.flags.delete}}&hellip;</button>
                 {{/if}}
               </td>
             </tr>
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 77316efcd..396e39b88 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -22,8 +22,8 @@
   </div>
 </div>
 <div class='controls'>
-  <button {{action save}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+  <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
   {{#unless automatic}}
-    <button {{action destroy}} class='btn btn-danger'><i class="fa fa-trash-o"></i>{{i18n admin.customize.delete}}</button>
+    <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i>{{i18n admin.customize.delete}}</button>
   {{/unless}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/groups.hbs b/app/assets/javascripts/admin/templates/groups.hbs
index 82cde250f..aac3928e6 100644
--- a/app/assets/javascripts/admin/templates/groups.hbs
+++ b/app/assets/javascripts/admin/templates/groups.hbs
@@ -4,13 +4,13 @@
     <ul>
       {{#each group in arrangedContent}}
         <li>
-        <a href='#' {{action showGroup group}}>{{group.name}} <span class="count">{{group.userCountDisplay}}</span></a>
+        <a href='#' {{action "showGroup" group}}>{{group.name}} <span class="count">{{group.userCountDisplay}}</span></a>
         </li>
       {{/each}}
     </ul>
     <div class='controls'>
       <button class='btn' {{bind-attr disabled="refreshingAutoGroups"}} {{action "refreshAutoGroups"}}><i class="fa fa-refresh"></i>{{i18n admin.groups.refresh}}</button>
-      <button class='btn' {{action newGroup}}><i class="fa fa-plus"></i>{{i18n admin.groups.new}}</button>
+      <button class='btn' {{action "newGroup"}}><i class="fa fa-plus"></i>{{i18n admin.groups.new}}</button>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/logs/details_modal.hbs b/app/assets/javascripts/admin/templates/logs/details_modal.hbs
index 3bc547a32..232e99373 100644
--- a/app/assets/javascripts/admin/templates/logs/details_modal.hbs
+++ b/app/assets/javascripts/admin/templates/logs/details_modal.hbs
@@ -2,5 +2,5 @@
   <pre>{{details}}</pre>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action closeModal}}>{{i18n close}}</button>
+  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
 </div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
index ca574ceb8..9cbd963f8 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
@@ -6,5 +6,5 @@
 <div class="col last_match_at">{{age-with-tooltip last_match_at}}</div>
 <div class="col created_at">{{age-with-tooltip created_at}}</div>
 <div class="col ip_address">{{ip_address}}</div>
-<div class="col action"><button class="btn" {{action clearBlock this}}><i class='fa fa-check'></i> {{i18n admin.logs.screened_emails.actions.allow}}</button></div>
+<div class="col action"><button class="btn" {{action "clearBlock" this}}><i class='fa fa-check'></i> {{i18n admin.logs.screened_emails.actions.allow}}</button></div>
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
index 7f6750f2e..23a21becc 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
@@ -2,7 +2,7 @@
   {{#if editing}}
     {{text-field value=ip_address autofocus="autofocus"}}
   {{else}}
-    <span {{action edit this}}>{{ip_address}}</span>
+    <span {{action "edit" this}}>{{ip_address}}</span>
   {{/if}}
 </div>
 <div class="col action">
@@ -18,16 +18,16 @@
 <div class="col created_at">{{age-with-tooltip created_at}}</div>
 <div class="col actions">
   {{#unless editing}}
-    <button class="btn btn-danger" {{action destroy this}}><i class="fa fa-trash-o"></i></button>
-    <button class="btn" {{action edit this}}><i class="fa fa-pencil"></i></button>
+    <button class="btn btn-danger" {{action "destroy" this}}><i class="fa fa-trash-o"></i></button>
+    <button class="btn" {{action "edit" this}}><i class="fa fa-pencil"></i></button>
     {{#if isBlocked}}
-      <button class="btn" {{action allow this}}><i {{bind-attr class=":fa doNothingIcon"}}></i> {{i18n admin.logs.screened_ips.actions.do_nothing}}</button>
+      <button class="btn" {{action "allow" this}}><i {{bind-attr class=":fa doNothingIcon"}}></i> {{i18n admin.logs.screened_ips.actions.do_nothing}}</button>
     {{else}}
-      <button class="btn" {{action block this}}><i {{bind-attr class=":fa blockIcon"}}></i> {{i18n admin.logs.screened_ips.actions.block}}</button>
+      <button class="btn" {{action "block" this}}><i {{bind-attr class=":fa blockIcon"}}></i> {{i18n admin.logs.screened_ips.actions.block}}</button>
     {{/if}}
   {{else}}
-    <button class="btn" {{action save this}}>{{i18n admin.logs.save}}</button>
-    <a {{action cancel this}}>{{i18n cancel}}</a>
+    <button class="btn" {{action "save" this}}>{{i18n admin.logs.save}}</button>
+    <a {{action "cancel" this}}>{{i18n cancel}}</a>
   {{/unless}}
 </div>
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
index d67216212..301ebd9d5 100644
--- a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
+++ b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
@@ -1,10 +1,10 @@
 <div>
   <ul class="nav nav-pills">
     <li {{bind-attr class="newSelected:active"}}>
-      <a href="#" {{action selectNew}}>{{i18n admin.logs.staff_actions.new_value}}</a>
+      <a href="#" {{action "selectNew"}}>{{i18n admin.logs.staff_actions.new_value}}</a>
     </li>
     <li {{bind-attr class="previousSelected:active"}}>
-      <a href="#" {{action selectPrevious}}>{{i18n admin.logs.staff_actions.previous_value}}</a>
+      <a href="#" {{action "selectPrevious"}}>{{i18n admin.logs.staff_actions.previous_value}}</a>
     </li>
   </ul>
   <div class="modal-body">
@@ -28,6 +28,6 @@
     </div>
   </div>
   <div class="modal-footer">
-    <button class='btn btn-primary' {{action closeModal}}>{{i18n close}}</button>
+    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
index 27834e21a..8788b2000 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
@@ -1,27 +1,27 @@
 <div class="staff-action-logs-controls">
-  <a {{action clearAllFilters}} {{bind-attr class=":clear-filters :filter filtersExists::invisible"}}>
+  <a {{action "clearAllFilters"}} {{bind-attr class=":clear-filters :filter filtersExists::invisible"}}>
     <span class="label">{{i18n admin.logs.staff_actions.clear_filters}}</span>
   </a>
   {{#if actionFilter}}
-    <a {{action clearFilter "action_name"}} class="filter">
+    <a {{action "clearFilter" "action_name"}} class="filter">
       <span class="label">{{i18n admin.logs.action}}</span>: {{actionFilter}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.acting_user}}
-    <a {{action clearFilter "acting_user"}} class="filter">
+    <a {{action "clearFilter" "acting_user"}} class="filter">
       <span class="label">{{i18n admin.logs.staff_actions.staff_user}}</span>: {{filters.acting_user}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.target_user}}
-    <a {{action clearFilter "target_user"}} class="filter">
+    <a {{action "clearFilter" "target_user"}} class="filter">
       <span class="label">{{i18n admin.logs.staff_actions.target_user}}</span>: {{filters.target_user}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.subject}}
-    <a {{action clearFilter "subject"}} class="filter">
+    <a {{action "clearFilter" "subject"}} class="filter">
       <span class="label">{{i18n admin.logs.staff_actions.subject}}</span>: {{filters.subject}}
       <i class="fa fa-times-circle"></i>
     </a>
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
index 14f5938f4..c0be5acc5 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
@@ -1,27 +1,27 @@
 <div class="col value first staff_user">
   {{#link-to 'adminUser' acting_user}}{{avatar acting_user imageSize="tiny"}}{{/link-to}}
-  <a {{action filterByStaffUser acting_user}} class="btn btn-small">{{acting_user.username}}</a>
+  <a {{action "filterByStaffUser" acting_user}} class="btn btn-small">{{acting_user.username}}</a>
 </div>
 <div class="col value action">
-  <a {{action filterByAction action_name}} class="btn btn-small">{{actionName}}</a>
+  <a {{action "filterByAction" action_name}} class="btn btn-small">{{actionName}}</a>
 </div>
 <div class="col value subject">
   {{#if target_user}}
     {{#link-to 'adminUser' target_user}}{{avatar target_user imageSize="tiny"}}{{/link-to}}
-    <a {{action filterByTargetUser target_user}} class="btn btn-small">{{target_user.username}}</a>
+    <a {{action "filterByTargetUser" target_user}} class="btn btn-small">{{target_user.username}}</a>
   {{/if}}
   {{#if subject}}
-    <a {{action filterBySubject subject}} {{bind-attr title="subject"}}  class="btn btn-small">{{subject}}</a>
+    <a {{action "filterBySubject" subject}} {{bind-attr title="subject"}}  class="btn btn-small">{{subject}}</a>
   {{/if}}
 </div>
 <div class="col value created_at">{{age-with-tooltip created_at}}</div>
 <div class="col value details">
   {{{formattedDetails}}}
   {{#if useCustomModalForDetails}}
-    <a {{action showCustomDetailsModal this}}>{{i18n admin.logs.staff_actions.show}}</a>
+    <a {{action "showCustomDetailsModal" this}}>{{i18n admin.logs.staff_actions.show}}</a>
   {{/if}}
   {{#if useModalForDetails}}
-    <a {{action showDetailsModal this}}>{{i18n admin.logs.staff_actions.show}}</a>
+    <a {{action "showDetailsModal" this}}>{{i18n admin.logs.staff_actions.show}}</a>
   {{/if}}
 </div>
 <div class="col value context">{{context}}</div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
index f06384a22..324d6f7bc 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
@@ -1,11 +1,11 @@
 {{#if user_deleted}}
-  <button title="{{i18n admin.flags.agree_flag_restore_post_title}}" {{action agreeFlagRestorePost}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n admin.flags.agree_flag_restore_post}}</button>
+  <button title="{{i18n admin.flags.agree_flag_restore_post_title}}" {{action "agreeFlagRestorePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n admin.flags.agree_flag_restore_post}}</button>
 {{else}}
   {{#unless postHidden}}
-    <button title="{{i18n admin.flags.agree_flag_hide_post_title}}" {{action agreeFlagHidePost}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n admin.flags.agree_flag_hide_post}}</button>
+    <button title="{{i18n admin.flags.agree_flag_hide_post_title}}" {{action "agreeFlagHidePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n admin.flags.agree_flag_hide_post}}</button>
   {{/unless}}
 {{/if}}
-<button title="{{i18n admin.flags.agree_flag_title}}" {{action agreeFlagKeepPost}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree_flag}}</button>
+<button title="{{i18n admin.flags.agree_flag_title}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree_flag}}</button>
 {{#if canDeleteAsSpammer}}
-  <button title="{{i18n admin.flags.delete_spammer_title}}" {{action deleteSpammer user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n admin.flags.delete_spammer}}</button>
+  <button title="{{i18n admin.flags.delete_spammer_title}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n admin.flags.delete_spammer}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/user_index.hbs b/app/assets/javascripts/admin/templates/user_index.hbs
index c9bf94c56..f5aac349e 100644
--- a/app/assets/javascripts/admin/templates/user_index.hbs
+++ b/app/assets/javascripts/admin/templates/user_index.hbs
@@ -7,13 +7,13 @@
         {{i18n admin.user.show_public_profile}}
       {{/link-to}}
       {{#if can_impersonate}}
-          <button class='btn btn-danger' {{action impersonate target="content"}} title="{{i18n admin.impersonate.help}}">
+          <button class='btn btn-danger' {{action "impersonate" target="content"}} title="{{i18n admin.impersonate.help}}">
             <i class='fa fa-crosshairs'></i>
             {{i18n admin.impersonate.title}}
           </button>
       {{/if}}
       {{#if currentUser.admin}}
-      <button class='btn' {{action log_out target="content"}}>
+      <button class='btn' {{action "log_out" target="content"}}>
         <i class='fa fa-power-off'></i>
         {{i18n admin.user.log_out}}
       </button>
@@ -42,7 +42,7 @@
         {{#if email}}
           <a href="mailto:{{unbound email}}">{{email}}</a>
         {{else}}
-          <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action checkEmail this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+          <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
         {{/if}}
       </div>
     </div>
@@ -53,7 +53,7 @@
         {{#if associated_accounts}}
           {{associated_accounts}}
         {{else}}
-          <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action checkEmail this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+          <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
         {{/if}}
       </div>
     </div>
@@ -70,15 +70,15 @@
       {{#if editingTitle}}
         {{text-field value=title autofocus="autofocus"}}
       {{else}}
-        <span {{action toggleTitleEdit}}>{{title}}&nbsp;</span>
+        <span {{action "toggleTitleEdit"}}>{{title}}&nbsp;</span>
       {{/if}}
     </div>
     <div class='controls'>
       {{#if editingTitle}}
-        <button class='btn' {{action saveTitle}}>{{i18n admin.user.save_title}}</button>
-        <a href="#" {{action toggleTitleEdit}}>{{i18n cancel}}</a>
+        <button class='btn' {{action "saveTitle"}}>{{i18n admin.user.save_title}}</button>
+        <a href="#" {{action "toggleTitleEdit"}}>{{i18n cancel}}</a>
       {{else}}
-        <button class='btn' {{action toggleTitleEdit}}><i class="fa fa-pencil"></i>{{i18n admin.user.edit_title}}</button>
+        <button class='btn' {{action "toggleTitleEdit"}}><i class="fa fa-pencil"></i>{{i18n admin.user.edit_title}}</button>
       {{/if}}
     </div>
   </div>
@@ -96,8 +96,8 @@
           {{combo-box content=custom_groups value=primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
         {{/if}}
         {{#if primaryGroupDirty}}
-          <button class='btn ok no-text' {{action savePrimaryGroup}}><i class='fa fa-check'></i></button>
-          <button class='btn cancel no-text' {{action resetPrimaryGroup}}><i class='fa fa-times'></i></button>
+          <button class='btn ok no-text' {{action "savePrimaryGroup"}}><i class='fa fa-check'></i></button>
+          <button class='btn cancel no-text' {{action "resetPrimaryGroup"}}><i class='fa fa-times'></i></button>
         {{/if}}
       </div>
     </div>
@@ -108,7 +108,7 @@
     <div class='value'>{{ip_address}}</div>
     <div class='controls'>
       {{#if currentUser.admin}}
-        <button class='btn' {{action refreshBrowsers target="content"}}>
+        <button class='btn' {{action "refreshBrowsers" target="content"}}>
           {{i18n admin.user.refresh_browsers}}
         </button>
         {{ip-lookup ip=ip_address user_id=id}}
@@ -179,7 +179,7 @@
           {{i18n admin.user.approve_success}}
         {{else}}
           {{#if can_approve}}
-            <button class='btn' {{action approve target="content"}}>
+            <button class='btn' {{action "approve" target="content"}}>
               <i class='fa fa-check'></i>
               {{i18n admin.user.approve}}
             </button>
@@ -201,18 +201,18 @@
     <div class='controls'>
       {{#if active}}
         {{#if can_deactivate}}
-          <button class='btn' {{action deactivate target="content"}}>{{i18n admin.user.deactivate_account}}</button>
+          <button class='btn' {{action "deactivate" target="content"}}>{{i18n admin.user.deactivate_account}}</button>
           {{i18n admin.user.deactivate_explanation}}
         {{/if}}
       {{else}}
         {{#if can_send_activation_email}}
-          <button class='btn' {{action sendActivationEmail target="content"}}>
+          <button class='btn' {{action "sendActivationEmail" target="content"}}>
             <i class='fa fa-envelope'></i>
             {{i18n admin.user.send_activation_email}}
           </button>
         {{/if}}
         {{#if can_activate}}
-          <button class='btn' {{action activate target="content"}}>
+          <button class='btn' {{action "activate" target="content"}}>
             <i class='fa fa-check'></i>
             {{i18n admin.user.activate}}
           </button>
@@ -227,15 +227,15 @@
     {{#if api_key}}
       <div class='long-value'>
         {{api_key.key}}
-        <button class='btn' {{action regenerateApiKey}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</button>
-        <button {{action revokeApiKey}} class="btn"><i class="fa fa-times"></i>{{i18n admin.api.revoke}}</button>
+        <button class='btn' {{action "regenerateApiKey"}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</button>
+        <button {{action "revokeApiKey"}} class="btn"><i class="fa fa-times"></i>{{i18n admin.api.revoke}}</button>
       </div>
     {{else}}
       <div class='value'>
       &mdash;
       </div>
       <div class='controls'>
-        <button {{action generateApiKey}} class="btn"><i class="fa fa-key"></i>{{i18n admin.api.generate}}</button>
+        <button {{action "generateApiKey"}} class="btn"><i class="fa fa-key"></i>{{i18n admin.api.generate}}</button>
       </div>
     {{/if}}
   </div>
@@ -245,13 +245,13 @@
     <div class='value'>{{admin}}</div>
     <div class='controls'>
       {{#if can_revoke_admin}}
-        <button class='btn' {{action revokeAdmin target="content"}}>
+        <button class='btn' {{action "revokeAdmin" target="content"}}>
           <i class='fa fa-shield'></i>
           {{i18n admin.user.revoke_admin}}
         </button>
       {{/if}}
       {{#if can_grant_admin}}
-        <button class='btn' {{action grantAdmin target="content"}}>
+        <button class='btn' {{action "grantAdmin" target="content"}}>
           <i class='fa fa-shield'></i>
           {{i18n admin.user.grant_admin}}
         </button>
@@ -264,13 +264,13 @@
     <div class='value'>{{moderator}}</div>
     <div class='controls'>
       {{#if can_revoke_moderation}}
-        <button class='btn' {{action revokeModeration target="content"}}>
+        <button class='btn' {{action "revokeModeration" target="content"}}>
           <i class='fa fa-shield'></i>
           {{i18n admin.user.revoke_moderation}}
         </button>
       {{/if}}
       {{#if can_grant_moderation}}
-        <button class='btn' {{action grantModeration target="content"}}>
+        <button class='btn' {{action "grantModeration" target="content"}}>
           <i class='fa fa-shield'></i>
           {{i18n admin.user.grant_moderation}}
         </button>
@@ -285,17 +285,17 @@
       {{combo-box content=trustLevels value=trust_level nameProperty="detailedName"}}
       {{#if dirty}}
         <div>
-        <button class='btn ok no-text' {{action saveTrustLevel target="content"}}><i class='fa fa-check'></i></button>
-        <button class='btn cancel no-text' {{action restoreTrustLevel target="content"}}><i class='fa fa-times'></i></button>
+        <button class='btn ok no-text' {{action "saveTrustLevel" target="content"}}><i class='fa fa-check'></i></button>
+        <button class='btn cancel no-text' {{action "restoreTrustLevel" target="content"}}><i class='fa fa-times'></i></button>
         </div>
       {{/if}}
     </div>
     <div class="controls">
       {{#if model.canLockTrustLevel}}
         {{#if model.trust_level_locked}}
-        <i title='{{i18n admin.user.trust_level_locked_tip}}' {{action lockTrustLevel false target="model"}} class='fa fa-lock'></i> <button class="btn" {{action lockTrustLevel false target="model"}}>{{i18n admin.user.unlock_trust_level}}</button>
+        <i title='{{i18n admin.user.trust_level_locked_tip}}' {{action "lockTrustLevel" false target="model"}} class='fa fa-lock'></i> <button class="btn" {{action "lockTrustLevel" false target="model"}}>{{i18n admin.user.unlock_trust_level}}</button>
         {{else}}
-        <i title='{{i18n admin.user.trust_level_unlocked_tip}}' class='fa fa-unlock'></i> <button class="btn" {{action lockTrustLevel true target="model"}}>{{i18n admin.user.lock_trust_level}}</button>
+        <i title='{{i18n admin.user.trust_level_unlocked_tip}}' class='fa fa-unlock'></i> <button class="btn" {{action "lockTrustLevel" true target="model"}}>{{i18n admin.user.lock_trust_level}}</button>
         {{/if}}
       {{/if}}
       {{#if tl3Requirements}}
@@ -310,7 +310,7 @@
     <div class='value'>{{isSuspended}}</div>
     <div class='controls'>
     {{#if isSuspended}}
-      <button class='btn btn-danger' {{action unsuspend target="content"}}>
+      <button class='btn btn-danger' {{action "unsuspend" target="content"}}>
         <i class='fa fa-ban'></i>
         {{i18n admin.user.unsuspend}}
       </button>
@@ -318,7 +318,7 @@
       {{i18n admin.user.suspended_explanation}}
     {{else}}
       {{#if canSuspend}}
-        <button class='btn btn-danger' {{action showSuspendModal this}}>
+        <button class='btn btn-danger' {{action "showSuspendModal" this}}>
           <i class='fa fa-ban'></i>
           {{i18n admin.user.suspend}}
         </button>
@@ -347,7 +347,7 @@
     <div class='value'>{{blocked}}</div>
     <div class='controls'>
       {{#if blocked}}
-        <button class='btn' {{action unblock target="content"}}>
+        <button class='btn' {{action "unblock" target="content"}}>
           <i class='fa fa-thumbs-o-up'></i>
           {{i18n admin.user.unblock}}
         </button>
@@ -385,7 +385,7 @@
     <div class='value'>{{post_count}}</div>
     <div class='controls'>
       {{#if can_delete_all_posts}}
-        <button class='btn btn-danger' {{action deleteAllPosts target="content"}}>
+        <button class='btn btn-danger' {{action "deleteAllPosts" target="content"}}>
           <i class='fa fa-trash-o'></i>
           {{i18n admin.user.delete_all_posts}}
         </button>
@@ -451,7 +451,7 @@
 
 <section>
   <hr/>
-  <button {{bind-attr class=":btn :btn-danger :pull-right deleteForbidden:hidden"}} {{action destroy target="content"}} {{bind-attr disabled="deleteForbidden"}}>
+  <button {{bind-attr class=":btn :btn-danger :pull-right deleteForbidden:hidden"}} {{action "destroy" target="content"}} {{bind-attr disabled="deleteForbidden"}}>
     <i class="fa fa-exclamation-triangle"></i>
     {{i18n admin.user.delete}}
   </button>
diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index 40ad5ee8b..32d3ca228 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -6,18 +6,18 @@
     <div class='panel clearfix'>
       {{#unless currentUser}}
         {{#if showSignUpButton}}
-        <button {{action showCreateAccount}} class='btn btn-primary btn-small sign-up-button'>
+        <button {{action "showCreateAccount"}} class='btn btn-primary btn-small sign-up-button'>
           {{i18n sign_up}}
         </button>
         {{/if}}
-        <button {{action showLogin}} class='btn btn-primary btn-small login-button'>
+        <button {{action "showLogin"}} class='btn btn-primary btn-small login-button'>
           {{fa-icon user}} {{i18n log_in}}
         </button>
       {{/unless}}
       <ul class='icons clearfix' role='navigation'>
         {{#if currentUser}}
           <li class='notifications'>
-            <a class='icon' href="#" {{action showNotifications target="view"}} data-notifications="notifications-dropdown" id='user-notifications' title='{{i18n notifications.title}}'>
+            <a class='icon' href="#" {{action "showNotifications" target="view"}} data-notifications="notifications-dropdown" id='user-notifications' title='{{i18n notifications.title}}'>
               {{fa-icon comment label="notifications.title"}}
             </a>
             {{#if currentUser.unread_notifications}}