diff --git a/web/templates/compose.hbs b/web/templates/compose.hbs
index dacdedabd7..39066d1741 100644
--- a/web/templates/compose.hbs
+++ b/web/templates/compose.hbs
@@ -52,7 +52,6 @@
         <div id="compose_banners"></div>
         <div class="composition-area">
             <form id="send_message_form" action="/json/messages" method="post">
-                {{ csrf_input }}
                 <div class="compose_table">
                     <div id="compose_top">
                         <div id="compose_top_right" class="order-2">
diff --git a/web/templates/confirm_dialog/confirm_deactivate_user.hbs b/web/templates/confirm_dialog/confirm_deactivate_user.hbs
index 1be9751fb3..b3217c9daa 100644
--- a/web/templates/confirm_dialog/confirm_deactivate_user.hbs
+++ b/web/templates/confirm_dialog/confirm_deactivate_user.hbs
@@ -20,7 +20,7 @@
 </p>
 <div class="new-style">
     <label class="checkbox">
-        <input type="checkbox" class="send_email" data-key="{{ key }}" />
+        <input type="checkbox" class="send_email" />
         <span></span>
         {{t "Notify this user by email?" }}
     </label>
diff --git a/web/templates/empty_feed_notice.hbs b/web/templates/empty_feed_notice.hbs
index 1937429b20..8f153505a4 100644
--- a/web/templates/empty_feed_notice.hbs
+++ b/web/templates/empty_feed_notice.hbs
@@ -1,6 +1,6 @@
 <div class="empty_feed_notice">
     <h4> {{ title }} </h4>
-    {{#if (or search_data.query_words search.topic_query search_data.stream_query)}}
+    {{#if search_data}}
     <div>
         {{#if search_data.has_stop_word}}{{t "Some common words were excluded from your search." }} <br/>{{/if}}{{t "You searched for:" }}
         {{#if search_data.stream_query}}
diff --git a/web/templates/navbar_alerts/navbar_alert_wrapper.hbs b/web/templates/navbar_alerts/navbar_alert_wrapper.hbs
index 2a44aac2b9..3b065fba0b 100644
--- a/web/templates/navbar_alerts/navbar_alert_wrapper.hbs
+++ b/web/templates/navbar_alerts/navbar_alert_wrapper.hbs
@@ -1,4 +1,4 @@
-<div data-process="{{data_process}}" class="alert alert-info {{custom_class}}">
+<div data-process="{{data_process}}" class="alert alert-info {{#if custom_class}}{{custom_class}}{{/if}}">
     {{{rendered_alert_content_html}}}
     <span class="close" data-dismiss="alert" aria-label="{{t 'Close' }}" role="button" tabindex=0>&times;</span>
 </div>
diff --git a/web/templates/recipient_row.hbs b/web/templates/recipient_row.hbs
index 42e5d4950b..2afcd125d6 100644
--- a/web/templates/recipient_row.hbs
+++ b/web/templates/recipient_row.hbs
@@ -38,7 +38,7 @@
             </span>
             <span class="recipient_bar_controls no-select">
                 <span class="topic_edit hidden-for-spectators">
-                    <span class="topic_edit_form" id="{{id}}"></span>
+                    <span class="topic_edit_form"></span>
                 </span>
 
                 {{! exterior links (e.g. to a trac ticket) }}
diff --git a/web/templates/settings/api_key_modal.hbs b/web/templates/settings/api_key_modal.hbs
index 53ba4f686a..1546c26d52 100644
--- a/web/templates/settings/api_key_modal.hbs
+++ b/web/templates/settings/api_key_modal.hbs
@@ -36,7 +36,7 @@
                 </button>
                 <div id="api_key_buttons">
                     <button class="modal__btn dialog_submit_button" id="regenerate_api_key" aria-label="{{t 'Generate new API key' }}">{{t "Generate new API key" }}</button>
-                    <a class="modal__btn dialog_submit_button" id="download_zuliprc" download="{{zuliprc}}" tabindex="0">{{t "Download .zuliprc" }}</a>
+                    <a class="modal__btn dialog_submit_button" id="download_zuliprc" download="zuliprc" tabindex="0">{{t "Download .zuliprc" }}</a>
                 </div>
             </footer>
         </div>
diff --git a/web/templates/settings/language_selection_widget.hbs b/web/templates/settings/language_selection_widget.hbs
index 6ea9a76c4d..1ac5b772af 100644
--- a/web/templates/settings/language_selection_widget.hbs
+++ b/web/templates/settings/language_selection_widget.hbs
@@ -6,7 +6,7 @@
         {{/if}}
     </label>
     <button type="button" class="language_selection_button button rounded small" data-section="{{section_name}}">
-        <span class="{{section_name}}" data-language-code="{{language_code}}">{{setting_value}}</span>
+        <span class="{{section_name}}">{{setting_value}}</span>
         <i class="fa fa-pencil"></i>
     </button>
 </div>
diff --git a/web/templates/settings/notification_settings.hbs b/web/templates/settings/notification_settings.hbs
index 41dcf39055..266216393d 100644
--- a/web/templates/settings/notification_settings.hbs
+++ b/web/templates/settings/notification_settings.hbs
@@ -42,7 +42,6 @@
             </tbody>
             {{#unless for_realm_settings}}
             <tbody id="stream-specific-notify-table">
-                {{> ../settings/stream_specific_notification_row }}
             </tbody>
             {{/unless}}
         </table>
diff --git a/web/templates/settings/settings_checkbox.hbs b/web/templates/settings/settings_checkbox.hbs
index 30f3e24c00..3109b10d1b 100644
--- a/web/templates/settings/settings_checkbox.hbs
+++ b/web/templates/settings/settings_checkbox.hbs
@@ -2,10 +2,10 @@
 <div class="input-group {{#if is_disabled}}control-label-disabled{{/if}}">
     <label class="checkbox">
         <input type="checkbox" class="{{setting_name}} inline-block setting-widget prop-element" name="{{setting_name}}" data-setting-widget-type="boolean"
-          id="{{prefix}}{{setting_name}}" {{#if is_checked}}checked="checked"{{/if}} {{#if is_disabled}}disabled{{/if}} />
+          id="{{#if prefix}}{{prefix}}{{/if}}{{setting_name}}" {{#if is_checked}}checked="checked"{{/if}} {{#if is_disabled}}disabled{{/if}} />
         <span></span>
     </label>
-    <label for="{{prefix}}{{setting_name}}" class="inline {{setting_name}}_label" id="{{prefix}}{{setting_name}}_label">
+    <label for="{{#if prefix}}{{prefix}}{{/if}}{{setting_name}}" class="inline {{setting_name}}_label" id="{{#if prefix}}{{prefix}}{{/if}}{{setting_name}}_label">
         {{label}}
         {{#if label_parens_text}}
         (<i>{{label_parens_text}}</i>)
diff --git a/web/templates/single_message.hbs b/web/templates/single_message.hbs
index 7c6ecf2ca2..31fa5746c1 100644
--- a/web/templates/single_message.hbs
+++ b/web/templates/single_message.hbs
@@ -1,5 +1,5 @@
 <div zid="{{msg/id}}" id="{{table_name}}{{msg/id}}"
-  class="message_row{{^msg/is_stream}} private-message{{/msg/is_stream}}{{#include_sender}} include-sender{{/include_sender}}{{#if mention_classname}} {{mention_classname}}{{/if}}{{#msg.unread}} unread{{/msg.unread}} {{#if msg.locally_echoed}}local{{/if}} selectable_row"
+  class="message_row{{#unless msg/is_stream}} private-message{{/unless}}{{#include_sender}} include-sender{{/include_sender}}{{#if mention_classname}} {{mention_classname}}{{/if}}{{#msg.unread}} unread{{/msg.unread}} {{#if msg.locally_echoed}}local{{/if}} selectable_row"
   role="listitem">
     <div class="unread_marker"><div class="unread-marker-fill"></div></div>
     {{#if want_date_divider}}
diff --git a/web/templates/status_emoji.hbs b/web/templates/status_emoji.hbs
index 6cb41c8082..7cbe263951 100644
--- a/web/templates/status_emoji.hbs
+++ b/web/templates/status_emoji.hbs
@@ -1,3 +1,4 @@
+{{#if .}}
 {{#if emoji_alt_code}}
 <span class="emoji_alt_code">&nbsp;:{{emoji_name}}:</span>
 {{else if still_url}}
@@ -8,3 +9,4 @@
 {{else if emoji_code}}
 <span class="emoji status_emoji emoji-{{emoji_code}}"></span>
 {{/if}}
+{{/if}}
diff --git a/web/templates/stream_settings/stream_types.hbs b/web/templates/stream_settings/stream_types.hbs
index 65a5b0c708..4628b9bfb4 100644
--- a/web/templates/stream_settings/stream_types.hbs
+++ b/web/templates/stream_settings/stream_types.hbs
@@ -74,8 +74,7 @@
             <input type="text" autocomplete="off"
               name="stream-message-retention-days"
               class="stream-message-retention-days message-retention-setting-custom-input time-limit-custom-input"
-              id="stream_message_retention_custom_input"
-              value="{{ stream_message_retention_days }}"/>
+              id="stream_message_retention_custom_input" />
         </div>
     </div>
 </div>