diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html
index c18fea81ba..eeec49ed5e 100644
--- a/templates/zerver/app/index.html
+++ b/templates/zerver/app/index.html
@@ -177,7 +177,10 @@
         </div>
     </div>
     {% include "zerver/app/invite_user.html" %}
-    {% include "zerver/app/logout.html" %}
+    <div class="hidden">
+        <form id="logout_form" action="/accounts/logout/" method="POST">{{ csrf_input }}
+        </form>
+    </div>
     {% include "zerver/app/deprecation_notice.html" %}
     {% include "zerver/app/about-zulip.html" %}
     <div id="user-profile-modal-holder"></div>
diff --git a/templates/zerver/app/logout.html b/templates/zerver/app/logout.html
deleted file mode 100644
index 2490f22975..0000000000
--- a/templates/zerver/app/logout.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<div class="hidden">
-    <form id="logout_form" action="/accounts/logout/" method="POST">{{ csrf_input }}
-    </form>
-</div>
diff --git a/templates/zerver/portico-header-dropdown.html b/templates/zerver/portico-header-dropdown.html
index ed9bb9a61a..0010d7be85 100644
--- a/templates/zerver/portico-header-dropdown.html
+++ b/templates/zerver/portico-header-dropdown.html
@@ -11,7 +11,10 @@
             </a>
         </li>
         <li class="logout">
-            {% include 'zerver/app/logout.html' %}
+            <div class="hidden">
+                <form id="logout_form" action="/accounts/logout/" method="POST">{{ csrf_input }}
+                </form>
+            </div>
             <a href="#logout">
                 <i class="fa fa-sign-out"></i>
                 Log out
diff --git a/tools/check-templates b/tools/check-templates
index 40e85ed953..00afba928b 100755
--- a/tools/check-templates
+++ b/tools/check-templates
@@ -62,6 +62,7 @@ def check_html_templates(templates: Iterable[str], all_dups: bool, fix: bool) ->
             "top_navbar",
             "id_email",
             "id_terms",
+            "logout_form",
             "send_confirm",
             "register",
             "footer",