diff --git a/src/server/response.cpp b/src/server/response.cpp
index 60f8caff5..608d616a1 100644
--- a/src/server/response.cpp
+++ b/src/server/response.cpp
@@ -106,7 +106,11 @@ HTTP404HtmlResponse::HTTP404HtmlResponse(const InternalServer& server,
                              RESOURCE::templates::_404_html)
 {
   kainjow::mustache::list emptyList;
-  this->m_data = kainjow::mustache::object{{"details", emptyList}};
+  this->m_data = kainjow::mustache::object{
+                    {"PAGE_TITLE",   "Content not found"},
+                    {"PAGE_HEADING", "Not Found"},
+                    {"details", emptyList}
+  };
 }
 
 HTTP404HtmlResponse& HTTP404HtmlResponse::operator+(UrlNotFoundMsg /*unused*/)
diff --git a/static/templates/404.html b/static/templates/404.html
index 795e8c9ef..5fcc0ff2c 100644
--- a/static/templates/404.html
+++ b/static/templates/404.html
@@ -2,10 +2,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta content="text/html;charset=UTF-8" http-equiv="content-type" />
-    <title>Content not found</title>
+    <title>{{PAGE_TITLE}}</title>
   </head>
   <body>
-    <h1>Not Found</h1>
+    <h1>{{PAGE_HEADING}}</h1>
 {{#details}}
     <p>
       {{{p}}}
