diff --git a/src/main/webapp/403.xhtml b/src/main/webapp/403.xhtml
index 499251d377b..6e076fa07d5 100644
--- a/src/main/webapp/403.xhtml
+++ b/src/main/webapp/403.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:o="http://omnifaces.org/ui"      
       xmlns:p="http://primefaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -34,5 +33,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/404.xhtml b/src/main/webapp/404.xhtml
index 9ffbeecff64..97a61759d31 100644
--- a/src/main/webapp/404.xhtml
+++ b/src/main/webapp/404.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:o="http://omnifaces.org/ui"      
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -44,5 +43,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/500.xhtml b/src/main/webapp/500.xhtml
index 657a6319047..4ad48696234 100644
--- a/src/main/webapp/500.xhtml
+++ b/src/main/webapp/500.xhtml
@@ -4,7 +4,6 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -21,5 +20,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/ThemeAndWidgets.xhtml b/src/main/webapp/ThemeAndWidgets.xhtml
index 3e3aac82809..fd8d7c7cf12 100644
--- a/src/main/webapp/ThemeAndWidgets.xhtml
+++ b/src/main/webapp/ThemeAndWidgets.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -28,5 +27,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/confirmemail.xhtml b/src/main/webapp/confirmemail.xhtml
index 2d52aaaa74e..1ac88a457c6 100644
--- a/src/main/webapp/confirmemail.xhtml
+++ b/src/main/webapp/confirmemail.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>  
 
@@ -29,5 +28,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml
index 3cbd36fb75c..bbac3e640f6 100644
--- a/src/main/webapp/dashboard-users.xhtml
+++ b/src/main/webapp/dashboard-users.xhtml
@@ -6,7 +6,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -115,5 +114,4 @@
         </ui:composition>
 
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/dashboard.xhtml b/src/main/webapp/dashboard.xhtml
index 1b062aafcf0..d43c591116f 100644
--- a/src/main/webapp/dashboard.xhtml
+++ b/src/main/webapp/dashboard.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -136,5 +135,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/dataset-widgets.xhtml b/src/main/webapp/dataset-widgets.xhtml
index e65038d2300..d8bef05ce71 100644
--- a/src/main/webapp/dataset-widgets.xhtml
+++ b/src/main/webapp/dataset-widgets.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -183,5 +182,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index 467e0419580..c7f41c24e8a 100755
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -10,7 +10,6 @@
       xmlns:cc="http://java.sun.com/jsf/composite"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
     <h:body>
@@ -1608,5 +1607,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index c634a88140e..b287d151122 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -7,7 +7,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -824,5 +823,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
index e03e9ddca83..3139bac06c4 100644
--- a/src/main/webapp/dataverse_template.xhtml
+++ b/src/main/webapp/dataverse_template.xhtml
@@ -10,6 +10,7 @@
       xmlns:c="http://java.sun.com/jsp/jstl/core"
       lang="#{dataverseLocaleBean.localeCode}"
       xml:lang="#{dataverseLocaleBean.localeCode}">
+    <f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
 	<o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
         <f:facet name="first">
@@ -115,4 +116,5 @@
         <ui:include src="google-analytics-snippet.xhtml"></ui:include>
         <ui:include src="piwik-analytics-snippet.xhtml"></ui:include>
     </h:body>
+    </f:view>
 </html>
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index 3e73ce9ffb0..ce9c373bf06 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:o="http://omnifaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -658,5 +657,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/editdatafiles.xhtml b/src/main/webapp/editdatafiles.xhtml
index 60ed3af78ee..cfc1bfdea70 100755
--- a/src/main/webapp/editdatafiles.xhtml
+++ b/src/main/webapp/editdatafiles.xhtml
@@ -10,7 +10,6 @@
       xmlns:cc="http://java.sun.com/jsf/composite"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -96,5 +95,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 29fc5e93337..ac4c3c1b780 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -10,7 +10,6 @@
       xmlns:cc="http://java.sun.com/jsf/composite"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -659,5 +658,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/guestbook-responses.xhtml b/src/main/webapp/guestbook-responses.xhtml
index 0c3449796d4..c72ca35055d 100644
--- a/src/main/webapp/guestbook-responses.xhtml
+++ b/src/main/webapp/guestbook-responses.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -92,6 +91,5 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
 
diff --git a/src/main/webapp/guestbook.xhtml b/src/main/webapp/guestbook.xhtml
index aeb4bb1cc31..5c05d714cbc 100644
--- a/src/main/webapp/guestbook.xhtml
+++ b/src/main/webapp/guestbook.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -199,6 +198,5 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
 
diff --git a/src/main/webapp/harvestclients.xhtml b/src/main/webapp/harvestclients.xhtml
index 8e5149175d8..3cc8c196bef 100644
--- a/src/main/webapp/harvestclients.xhtml
+++ b/src/main/webapp/harvestclients.xhtml
@@ -6,7 +6,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -563,5 +562,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/harvestsets.xhtml b/src/main/webapp/harvestsets.xhtml
index 88a9cbcabb0..fc7c91a1ef1 100644
--- a/src/main/webapp/harvestsets.xhtml
+++ b/src/main/webapp/harvestsets.xhtml
@@ -6,7 +6,6 @@
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -334,5 +333,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/iframe.xhtml b/src/main/webapp/iframe.xhtml
index 183c9db66c9..5effa8e4af4 100644
--- a/src/main/webapp/iframe.xhtml
+++ b/src/main/webapp/iframe.xhtml
@@ -7,7 +7,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       lang="en">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
         <title><h:outputText value="#{pageTitle}"/></title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -83,5 +82,4 @@
         <ui:include src="google-analytics-snippet.xhtml"></ui:include>
         <ui:include src="piwik-analytics-snippet.xhtml"></ui:include>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
index ba44fea18db..316e46b8570 100644
--- a/src/main/webapp/loginpage.xhtml
+++ b/src/main/webapp/loginpage.xhtml
@@ -7,7 +7,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:fn="http://java.sun.com/jsp/jstl/functions"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -228,5 +227,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/manage-groups.xhtml b/src/main/webapp/manage-groups.xhtml
index 3fd5b5a656c..47bf47974b9 100644
--- a/src/main/webapp/manage-groups.xhtml
+++ b/src/main/webapp/manage-groups.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
     <h:body>
@@ -183,5 +182,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/manage-guestbooks.xhtml b/src/main/webapp/manage-guestbooks.xhtml
index 0b44424b804..3311bddb115 100644
--- a/src/main/webapp/manage-guestbooks.xhtml
+++ b/src/main/webapp/manage-guestbooks.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:o="http://omnifaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
     <h:body>
@@ -227,5 +226,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/manage-templates.xhtml b/src/main/webapp/manage-templates.xhtml
index 00572109d20..6c050e63b1c 100644
--- a/src/main/webapp/manage-templates.xhtml
+++ b/src/main/webapp/manage-templates.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
     <h:body>
@@ -193,5 +192,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/oauth2/callback.xhtml b/src/main/webapp/oauth2/callback.xhtml
index 8d80b9e4afe..f0d66b2fa74 100644
--- a/src/main/webapp/oauth2/callback.xhtml
+++ b/src/main/webapp/oauth2/callback.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:o="http://omnifaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -54,5 +53,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/oauth2/convert.xhtml b/src/main/webapp/oauth2/convert.xhtml
index eb260c613fb..108f170918a 100644
--- a/src/main/webapp/oauth2/convert.xhtml
+++ b/src/main/webapp/oauth2/convert.xhtml
@@ -5,9 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
-
     </h:head>
 
     <h:body>
@@ -85,5 +83,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/oauth2/firstLogin.xhtml b/src/main/webapp/oauth2/firstLogin.xhtml
index 6445f327c04..78b9d15d618 100644
--- a/src/main/webapp/oauth2/firstLogin.xhtml
+++ b/src/main/webapp/oauth2/firstLogin.xhtml
@@ -5,9 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
-
     </h:head>
 
     <h:body>
@@ -145,5 +143,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml
index 84d1b2a8bdc..71dcbb3968d 100644
--- a/src/main/webapp/passwordreset.xhtml
+++ b/src/main/webapp/passwordreset.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -149,5 +148,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml
index e08842f3541..a8f9e5818e8 100644
--- a/src/main/webapp/permissions-manage-files.xhtml
+++ b/src/main/webapp/permissions-manage-files.xhtml
@@ -8,7 +8,6 @@
       xmlns:o="http://omnifaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
     <h:body>
@@ -353,5 +352,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml
index 5edb80b8a40..3f1506136f1 100644
--- a/src/main/webapp/permissions-manage.xhtml
+++ b/src/main/webapp/permissions-manage.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://java.sun.com/jsp/jstl/core"
       xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -232,5 +231,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/privateurl.xhtml b/src/main/webapp/privateurl.xhtml
index 03c63861125..7da9a9cf882 100644
--- a/src/main/webapp/privateurl.xhtml
+++ b/src/main/webapp/privateurl.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -21,5 +20,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/role_permission_helper.xhtml b/src/main/webapp/role_permission_helper.xhtml
index 736c5c52803..c28813a060d 100644
--- a/src/main/webapp/role_permission_helper.xhtml
+++ b/src/main/webapp/role_permission_helper.xhtml
@@ -5,9 +5,7 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:jsf="http://xmlns.jcp.org/jsf"
       xmlns:p="http://primefaces.org/ui">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
   <h:head>
-
   </h:head>
 
   <h:body>
@@ -87,5 +85,4 @@
       </ui:define>
     </ui:composition>
   </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/search/advanced.xhtml b/src/main/webapp/search/advanced.xhtml
index 4d32b308fc2..305785ac11d 100644
--- a/src/main/webapp/search/advanced.xhtml
+++ b/src/main/webapp/search/advanced.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -217,5 +216,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
diff --git a/src/main/webapp/shib.xhtml b/src/main/webapp/shib.xhtml
index 1fd51818c1c..4d149cdbf02 100644
--- a/src/main/webapp/shib.xhtml
+++ b/src/main/webapp/shib.xhtml
@@ -5,7 +5,6 @@
       xmlns:ui="http://java.sun.com/jsf/facelets"
       xmlns:p="http://primefaces.org/ui"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -139,5 +138,4 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index b65bb89c5e7..49f66d8a545 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -6,7 +6,6 @@
       xmlns:p="http://primefaces.org/ui"
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:jsf="http://xmlns.jcp.org/jsf">
-<f:view locale="#{dataverseLocaleBean.localeCode}">
     <h:head>
     </h:head>
 
@@ -137,6 +136,5 @@
             </ui:define>
         </ui:composition>
     </h:body>
-</f:view>
 </html>