From: Roland Häder <roland@mxchange.org>
Date: Mon, 22 Aug 2016 13:48:04 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=30dae4576f67b2f818eebecd35e3a9811ccd4559;p=jjobs-war.git

Please cherry-pick:
- placed more text into h:outputText tags

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml
index 06972855..6e801e5b 100644
--- a/web/WEB-INF/templates.dist/admin_page.xhtml
+++ b/web/WEB-INF/templates.dist/admin_page.xhtml
@@ -8,10 +8,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_FOO}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_FOO}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_FOO}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_FOO}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml
index eb4dd328..3fd51eae 100644
--- a/web/WEB-INF/templates.dist/guest_login_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_FOO}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_FOO}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml
index fa84908d..c42f45c3 100644
--- a/web/WEB-INF/templates.dist/guest_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_page.xhtml
@@ -8,10 +8,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_FOO}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_FOO}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_FOO}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index 7d99bc17..a47f1bf5 100644
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -7,14 +7,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
-
-		<ui:define name="menu">
-			<ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_FOO}" />
 		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.SUB_TITLE_LOGIN_FOO}
+			<h:outputText value="#{msg.SUB_TITLE_USER_LOGIN_FOO}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 0b87c325..f394ec0d 100644
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -5,7 +5,9 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-	<ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title">Default login title</ui:insert></ui:define>
+	<ui:define name="title">
+		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" /> - <ui:insert name="login_title">Default login title</ui:insert>
+	</ui:define>
 
 	<ui:define name="menu">
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index 25b55f29..7e5a13f3 100644
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOGOUT}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOGOUT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LOGOUT}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LOGOUT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 6a069436..a7bc592c 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index ecb3d09d..cfe2f735 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 687aac11..ae78b819 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -9,10 +9,12 @@
 	xmlns:p="http://primefaces.org/ui">
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_CONTACT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_CONTACT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index c8fe4334..edf0c917 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 3d797098..ed1ce535 100644
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 6d0e615d..348a479d 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_FAX_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 489ee1f0..933d7e71 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 1c226a3c..417485ac 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -15,10 +15,12 @@
 	</ui:define>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml
index c5bee9d3..256dc932 100644
--- a/web/admin/country/admin_country_delete.xhtml
+++ b/web/admin/country/admin_country_delete.xhtml
@@ -1,3 +1,4 @@
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html
 	lang="#{localizationController.language}" xml:lang="#{localizationController.language}"
@@ -8,10 +9,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_COUNTRY}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_COUNTRY}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml
index efede20c..f52766e4 100644
--- a/web/admin/country/admin_country_edit.xhtml
+++ b/web/admin/country/admin_country_edit.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_COUNTRY}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_COUNTRY}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index a34b3406..d821574a 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index ade80e5a..508a6ff0 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -14,10 +14,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_FAX}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_FAX}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_FAX}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index 920737e3..a15bc787 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_FAX}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_FAX}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_FAX}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_FAX}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index c8bd8941..97a897c3 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_FAX}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_FAX}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 81251537..d630c0f6 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -14,10 +14,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_FAX}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_FAX}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_FAX}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_FAX}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml
index eb077993..4f9e2292 100644
--- a/web/admin/index.xhtml
+++ b/web/admin/index.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_WELCOME}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_WELCOME}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_WELCOME}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_WELCOME}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 67f398ee..f0079984 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -14,10 +14,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_LAND_LINE}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_LAND_LINE}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_LAND_LINE}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index fdde99c1..6a25bc4c 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_LAND_LINE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 82b000d2..ebf79527 100644
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_LAND_LINE}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index 6ceeb3ca..6b1c0051 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -14,10 +14,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_LAND_LINE}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_LAND_LINE}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index c9377851..7f0d5b90 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -14,10 +14,12 @@
 	</ui:define>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 88aef070..b2ff95dd 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -15,10 +15,12 @@
 	</ui:define>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index daf4f5bb..54b1fc6b 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_MOBILE_NUMBER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 6beb5e68..ee3d99c1 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -14,7 +14,9 @@
 	</ui:define>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_NUMBER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_NUMBER}
diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
index 99566d6b..1553f750 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
index da2bbb45..b4a05224 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index a34d3777..345957e2 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
index 153b763b..fb95c150 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 2dda44de..7ae2cb45 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_USER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_DELETE_USER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_USER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_DELETE_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 083296fa..67917375 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -16,10 +16,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_USER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EDIT_USER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index 65bb4c67..dab2e8f1 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -8,10 +8,12 @@
 	xmlns:p="http://primefaces.org/ui">
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_EXPORT_USER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EXPORT_USER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_EXPORT_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 2650593a..5863e1dc 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_USER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LIST_USER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_USER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_LIST_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 04443773..39977d14 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -16,7 +16,9 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOCK_USER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_LOCK_USER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
 			#{msg.CONTENT_TITLE_ADMIN_LOCK_USER}
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index 2694b41b..e96b1601 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_USER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_SHOW_USER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 9682c043..6963266e 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -15,10 +15,12 @@
 	</ui:define>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}</ui:define>
+		<ui:define name="admin_title">
+			<h:outputText value="#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}
+			<h:outputText value="#{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/exception.xhtml b/web/exception.xhtml
index 2996a8c0..0e145b20 100644
--- a/web/exception.xhtml
+++ b/web/exception.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_EXCEPTION_THROWN}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_EXCEPTION_THROWN}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_EXCEPTION_THROWN}
+			<h:outputText value="#{msg.CONTENT_TITLE_EXCEPTION_THROWN}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml
index a6d5789c..0fde6a06 100644
--- a/web/guest/user/confirm_account.xhtml
+++ b/web/guest/user/confirm_account.xhtml
@@ -15,10 +15,12 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_CONFIRM_ACCOUNT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_CONFIRM_ACCOUNT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index d28bc0ce..0e710276 100644
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -8,10 +8,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_LOGIN}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/login_error.xhtml b/web/guest/user/login_error.xhtml
index 3bce0b7a..03d80839 100644
--- a/web/guest/user/login_error.xhtml
+++ b/web/guest/user/login_error.xhtml
@@ -9,10 +9,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="login_error">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOGIN_ERROR}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_ERROR}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_LOGIN_ERROR}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_ERROR}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
index 4e8536ea..d7db1d12 100644
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -8,10 +8,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOST_PASSWORD}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml
index 2ee42d82..1bf51168 100644
--- a/web/guest/user/register.xhtml
+++ b/web/guest/user/register.xhtml
@@ -8,19 +8,23 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_REGISTER}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER}" />
 		</ui:define>
 
 		<ui:define name="content">
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_registration')}">
 				<ui:fragment rendered="#{featureController.isFeatureEnabled('user_name_required')}">
 					<div class="para">
-						#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}
+						<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_1}" />
+						<h:outputText value="&nbsp;" />
 						<h:link outcome="user_login" value="#{msg.CLICK_HERE}" />
-						#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}
+						<h:outputText value="&nbsp;" />
+						<h:outputText value="#{msg.GUEST_ALREADY_USER_CONTINUE_LOGIN_2}" />
 					</div>
 				</ui:fragment>
 
diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml
index 5a4d6080..65b3bda1 100644
--- a/web/guest/user/register_done.xhtml
+++ b/web/guest/user/register_done.xhtml
@@ -8,10 +8,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER_DONE}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_DONE}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_REGISTER_DONE}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_DONE}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/register_page2.xhtml b/web/guest/user/register_page2.xhtml
index e00f5542..4737d087 100644
--- a/web/guest/user/register_page2.xhtml
+++ b/web/guest/user/register_page2.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_REGISTER_PAGE2}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_REGISTER_PAGE2}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/resend_done.xhtml b/web/guest/user/resend_done.xhtml
index 2cf5efea..c062782f 100644
--- a/web/guest/user/resend_done.xhtml
+++ b/web/guest/user/resend_done.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_USER_RESEND_DONE}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_RESEND_DONE}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_RESEND_DONE}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_RESEND_DONE}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
index bbd665b9..da489ba5 100644
--- a/web/guest/user/resend_link.xhtml
+++ b/web/guest/user/resend_link.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_RESEND_LINK}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_RESEND_LINK}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_RESEND_LINK}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_RESEND_LINK}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 65ba73f2..c07179ad 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -7,10 +7,12 @@
 	  xmlns:f="http://xmlns.jcp.org/jsf/core">
 
 	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LIST}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_LIST}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LIST}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 62ff8d7d..5428ccd4 100644
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -16,11 +16,16 @@
 			</f:metadata>
 		</ui:define>
 
-		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}</ui:define>
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_PROFILE}" />
+		</ui:define>
+
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_USER_PROFILE}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_USER_PROFILE}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_USER_PROFILE}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index 5578d959..3a54f92c 100644
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_IMPRINT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_IMPRINT}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_IMPRINT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/index.xhtml b/web/index.xhtml
index 68ad41bf..9b7f7cde 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_WELCOME}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_WELCOME}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_WELCOME}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_WELCOME}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index 6cb3893e..01a29d18 100644
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_PRIVACY}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_PRIVACY}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_PRIVACY}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/terms.xhtml b/web/terms.xhtml
index 1e7acae5..c6be672e 100644
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/#{userLoginController.baseTemplatePathName}_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
+		<ui:define name="guest_title">
+			<h:outputText value="#{msg.PAGE_TITLE_INDEX_TERMS}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_TERMS}
+			<h:outputText value="#{msg.CONTENT_TITLE_INDEX_TERMS}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 73a2fdbb..551dcc80 100644
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -7,11 +7,13 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}</ui:define>
+	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_CHANGE_EMAIL_ADDRESS}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_EMAIL_ADDRESS}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index bff6c902..fc370b84 100644
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PASSWORD}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PASSWORD}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
index ec2a7cfb..75590cdf 100644
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CHANGE_PERSONAL_DATA}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_CHANGE_PERSONAL_DATA}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CHANGE_PERSONAL_DATA}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index f33cf16a..d2b1e88c 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_CONTACT_DATA_SAVED}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_CONTACT_DATA_SAVED}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
index 62b20ab0..e92ea8fe 100644
--- a/web/user/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -8,10 +8,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_DATA_SAVED}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_DATA_SAVED}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_DATA_SAVED}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 162b2eac..29cf9fd4 100644
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_EDIT_USER_DATA}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_EDIT_USER_DATA}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_EDIT_USER_DATA}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_index.xhtml b/web/user/login_index.xhtml
index b85c6661..c8f9c836 100644
--- a/web/user/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -8,10 +8,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_HOME}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_HOME}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_HOME}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_HOME}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml
index 4c8a6516..10efa901 100644
--- a/web/user/login_logout.xhtml
+++ b/web/user/login_logout.xhtml
@@ -8,10 +8,12 @@
 	>
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_LOGIN_USER_LOGOUT}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT}
+			<h:outputText value="#{msg.CONTENT_TITLE_LOGIN_USER_LOGOUT}" />
 		</ui:define>
 
 		<ui:define name="content">
diff --git a/web/user/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
index f0831d0b..91818480 100644
--- a/web/user/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -8,10 +8,12 @@
 	  >
 
 	<ui:composition template="/WEB-INF/templates/login/user/user_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_DATA_SAVED}</ui:define>
+		<ui:define name="login_title">
+			<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_USER_DATA_SAVED}" />
+		</ui:define>
 
 		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}
+			<h:outputText value="#{msg.CONTENT_TITLE_USER_LOGIN_USER_DATA_SAVED}" />
 		</ui:define>
 
 		<ui:define name="content">