diff --git a/packages/ui-default/entry.js b/packages/ui-default/entry.js
index edd988d30..a675ae082 100644
--- a/packages/ui-default/entry.js
+++ b/packages/ui-default/entry.js
@@ -48,6 +48,7 @@ const prefetch = Promise.all([
document.addEventListener('DOMContentLoaded', async () => {
Object.assign(window.UiContext, JSON.parse(window.UiContextNew));
+ Object.assign(window.UserContext, JSON.parse(window.UserContextNew));
const [data, HydroExports] = await prefetch;
Object.assign(window, { HydroExports });
eval(data); // eslint-disable-line no-eval
diff --git a/packages/ui-default/templates/layout/html5.html b/packages/ui-default/templates/layout/html5.html
index eba4eb1c8..dc06df6fb 100644
--- a/packages/ui-default/templates/layout/html5.html
+++ b/packages/ui-default/templates/layout/html5.html
@@ -64,6 +64,7 @@
var UserContext = '{{ UserContext|json|jsesc|safe }}';
{% set UiContext = Object.create(UiContext) %}
+ {% set UserContext = Object.create(UserContext) %}
{% if process.env.DEV %}
@@ -75,7 +76,10 @@
{% block body %}{% endblock %}
{% block script %}{% endblock %}
{% if not isIE(handler.request.headers['user-agent']) and not handler.session.legacy %}
-
+
{% endif %}