--- a/src/main/webapp/WEB-INF/jsp/site.jsp	Sat May 23 13:34:41 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/site.jsp	Sat May 23 13:52:04 2020 +0200
@@ -52,8 +52,8 @@
 <%-- Define an alias for the additional stylesheet --%>
 <c:set scope="page" var="extraCss" value="${requestScope[Constants.REQ_ATTR_STYLESHEET]}"/>
 
-<%-- Define an alias for the module info --%>
-<c:set scope="page" var="moduleInfo" value="${requestScope[Constants.REQ_ATTR_MODULE_INFO]}"/>
+<%-- Define an alias for the bundle name --%>
+<c:set scope="page" var="bundleName" value="${requestScope[Constants.REQ_ATTR_RESOURCE_BUNDLE]}"/>
 
 <%-- Apply the session locale (should always be present, but check nevertheless) --%>
 <c:if test="${not empty sessionScope[Constants.SESSION_ATTR_LANGUAGE]}">
@@ -63,15 +63,15 @@
 <%-- Selected project, if any --%>
 <c:set scope="page" var="selectedProject" value="${sessionScope[ProjectsModule.SESSION_ATTR_SELECTED_PROJECT]}"/>
 
+<%-- Load resource bundles --%>
+<fmt:setBundle scope="request" basename="${bundleName}"/>
+<fmt:setBundle scope="request" var="lightpit_bundle" basename="localization.lightpit"/>
+
 <!DOCTYPE html>
 <html>
 <head>
     <base href="${baseHref}">
-    <title>LightPIT -
-        <fmt:bundle basename="${moduleInfo.bundleBaseName}">
-            <fmt:message key="pageTitle"/>
-        </fmt:bundle>
-    </title>
+    <title>LightPIT - <fmt:message key="pageTitle"/></title>
     <meta charset="UTF-8">
     <c:if test="${not empty redirectLocation}">
         <meta http-equiv="refresh" content="0; URL=${redirectLocation}">
@@ -96,8 +96,6 @@
 </c:if>
 <div id="content-area">
     <c:if test="${not empty contentPage}">
-        <fmt:setBundle scope="request" basename="${moduleInfo.bundleBaseName}"/>
-        <fmt:setBundle scope="request" var="lightpit_bundle" basename="localization.lightpit"/>
         <c:import url="${contentPage}"/>
     </c:if>
 </div>