diff --git a/authentik/flows/templates/flows/shell.html b/authentik/flows/templates/flows/shell.html
index 6f7b52720..0197da38d 100644
--- a/authentik/flows/templates/flows/shell.html
+++ b/authentik/flows/templates/flows/shell.html
@@ -3,16 +3,10 @@
 {% load static %}
 
 {% block head %}
-{{ block.super }}
-<style>
-.pf-c-background-image::before {
-    background-image: url("{{ background_url }}");
-    background-position: center;
-}
-</style>
 <script src="{% static 'dist/flow.js' %}?v={{ ak_version }}" type="module"></script>
 {% endblock %}
 
 {% block body %}
+<ak-message-container></ak-message-container>
 <ak-flow-executor></ak-flow-executor>
 {% endblock %}
diff --git a/web/src/flow.ts b/web/src/flow.ts
index 0c7d9baac..9fe22476c 100644
--- a/web/src/flow.ts
+++ b/web/src/flow.ts
@@ -1,3 +1,4 @@
 import "construct-style-sheets-polyfill";
 
+import "./elements/messages/MessageContainer";
 import "./flows/FlowExecutor";
diff --git a/web/src/flows/FlowExecutor.ts b/web/src/flows/FlowExecutor.ts
index 11b28b5d2..bdec49c96 100644
--- a/web/src/flows/FlowExecutor.ts
+++ b/web/src/flows/FlowExecutor.ts
@@ -232,7 +232,6 @@ export class FlowExecutor extends LitElement implements StageHost {
                 </filter>
             </svg>
         </div>
-        <ak-message-container></ak-message-container>
         <div class="pf-c-login">
             <div class="ak-login-container">
                 <header class="pf-c-login__header">
diff --git a/web/src/interfaces/flow/index.html b/web/src/interfaces/flow/index.html
index 21b2aed8d..9d3071349 100644
--- a/web/src/interfaces/flow/index.html
+++ b/web/src/interfaces/flow/index.html
@@ -11,6 +11,7 @@
         <script src="/static/dist/flow.js" type="module"></script>
     </head>
     <body>
+        <ak-message-container></ak-message-container>
         <ak-flow-executor></ak-flow-executor>
     </body>
 </html>
