diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index ddc64074e1c..db44af018fd 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -16,6 +16,7 @@
         'views/event_templates.xml',
         'views/event_templates_misc_pages.xml',
         'views/event_templates_registration.xml',
+        'views/website_templates.xml',
         'views/event_views.xml',
         'security/ir.model.access.csv',
         'security/event_security.xml',
diff --git a/addons/website_event/views/event_templates_misc_pages.xml b/addons/website_event/views/event_templates_misc_pages.xml
index b20eba9943a..50bfc4cb637 100644
--- a/addons/website_event/views/event_templates_misc_pages.xml
+++ b/addons/website_event/views/event_templates_misc_pages.xml
@@ -54,4 +54,18 @@
     </t>
 </template>
 
+<template id="404" name="Event 404">
+    <t t-call="website.layout">
+        <div id="wrap">
+            <div class="oe_structure oe_empty">
+                <div class="container">
+                    <h1 class="mt-4">Event not found!</h1>
+                    <p>Sorry, the requested event is not available anymore.</p>
+                    <p><a t-attf-href="/event">Return to the event list.</a></p>
+                </div>
+            </div>
+        </div>
+    </t>
+</template>
+
 </odoo>
diff --git a/addons/website_event/views/website_templates.xml b/addons/website_event/views/website_templates.xml
new file mode 100644
index 00000000000..28d4593c57c
--- /dev/null
+++ b/addons/website_event/views/website_templates.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<!-- User Navbar -->
+<template id="user_navbar_inherit_website_event" inherit_id="website.user_navbar">
+    <xpath expr="//div[@id='o_new_content_menu_choices']//div[@name='module_website_event']" position="attributes">
+        <attribute name="name"/>
+        <attribute name="t-att-data-module-id"/>
+        <attribute name="t-att-data-module-shortdesc"/>
+        <attribute name="groups">event.group_event_manager</attribute>
+    </xpath>
+</template>
+
+<!-- User Navbar - Edit Options -->
+<template id="event_edit_options" inherit_id="website.user_navbar" name="Edit Event Options">
+    <xpath expr="//li[@id='edit-page-menu']" position="after">
+        <t t-if="main_object._name == 'event.event'" t-set="action" t-value="'event.action_event_view'"/>
+    </xpath>
+</template>
+
+</odoo>