From: Roland Häder <roland@mxchange.org>
Date: Wed, 24 Aug 2016 10:07:52 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d5ec1b4cc06a6296cc070543697df03f3bf5bffb;p=jjobs-war.git

Please cherry-pick:
- converted h:outputText (simple output) into a nicer message box

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

diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
index 312e437c..a5d91955 100644
--- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+	<ui:fragment rendered="#{empty beanHelper.contact}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.contact}">
 		<div class="table_header">
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
index 257f2404..21f97818 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+	<ui:fragment rendered="#{empty beanHelper.contact}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<ui:fragment rendered="#{empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
 		<ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
index 3f3e22f1..72230476 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+	<ui:fragment rendered="#{empty beanHelper.faxNumber}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.faxNumber}">
 		<f:facet name="header">
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
index 1b6bb5b5..61e466e1 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+	<ui:fragment rendered="#{empty beanHelper.faxNumber}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<ui:fragment rendered="#{not empty beanHelper.faxNumber}">
 		<ul class="mini_nav">
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index b350fa75..ceaa9526 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+	<ui:fragment rendered="#{empty beanHelper.contact}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
 		<h:panelGroup styleClass="table_medium" layout="block">
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index ac03e7d9..c2137c0f 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+	<ui:fragment rendered="#{empty beanHelper.faxNumber}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<div class="para">
 		<fieldset class="fieldset" id="fax_data">
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index b42fab6e..b110d8ae 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+	<ui:fragment rendered="#{empty beanHelper.contact}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
 		<h:panelGroup styleClass="table_medium" layout="block">
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index ac54e972..a560cac7 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+	<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<div class="para">
 		<fieldset class="fieldset" id="landline_data">
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
index 35fc34d3..4ed5e600 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+	<ui:fragment rendered="#{empty beanHelper.contact}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
 		<ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
index 8b7c5a03..45d494ec 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+	<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
 		<f:facet name="header">
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
index cd5c60a7..6ffb7660 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+	<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
 		<ul class="mini_nav">
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index cb686076..b6c73ff0 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+	<ui:fragment rendered="#{empty beanHelper.contact}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
 		<h:panelGroup styleClass="table_medium" layout="block">
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
index 742cc4a2..ff56323e 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+	<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<div class="para">
 		<fieldset class="fieldset" id="mobile_data">
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
index 82e5c697..de0dd7e7 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+	<ui:fragment rendered="#{empty beanHelper.contact}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
 		<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
index f7648aab..95cfde3f 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+	<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
 		<f:facet name="header">
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
index 18fcec5b..33d5ed3a 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+	<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
 		<ul class="mini_nav">
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index a5308ed8..20adfba3 100644
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" rendered="#{empty mode}" />
+	<ui:fragment rendered="#{empty mode}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ADMIN_USER_DATA_PASSWORD_NOTICE}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<ui:fragment rendered="#{not empty mode}">
 		<div class="para">
diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index 180cc90b..a00b77df 100644
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" rendered="#{empty beanHelper.user}" />
+	<ui:fragment rendered="#{empty beanHelper.user}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
 		<div class="table_header">
diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
index dfa9efcb..5292c5b8 100644
--- a/web/WEB-INF/templates/generic/gender_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl
@@ -5,12 +5,17 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+	<ui:fragment rendered="#{empty targetController}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
+
 	<ui:fragment rendered="#{not empty targetController}">
 		<h:selectOneMenu styleClass="select" id="gender" value="#{targetController.gender}" required="#{featureController.isFeatureEnabled(targetController.controllerType + '_gender')}" requiredMessage="#{msg.FIELD_GENDER_REQUIRED}">
 			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
 			<f:selectItems value="#{genderController.selectableGenders}" var="gender" itemValue="#{gender}" itemLabel="#{msg[gender.messageKey]}" />
 		</h:selectOneMenu>
 	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
 </ui:composition>
diff --git a/web/WEB-INF/templates/generic/message_box.tpl b/web/WEB-INF/templates/generic/message_box.tpl
index e4cad0f7..07c5b1e4 100644
--- a/web/WEB-INF/templates/generic/message_box.tpl
+++ b/web/WEB-INF/templates/generic/message_box.tpl
@@ -12,9 +12,17 @@
 		</div>
 
 		<ui:fragment rendered="#{not empty message}">
-			<div class="okay para">
-				<h:outputText value="#{message}" />
-			</div>
+			<ui:fragment rendered="#{not empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="#{styleClass}" value="#{message}" />
+				</div>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{empty styleClass}">
+				<div class="para">
+					<h:outputText styleClass="okay" value="#{message}" />
+				</div>
+			</ui:fragment>
 		</ui:fragment>
 
 		<ui:fragment rendered="#{empty message}">
diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
index 0dd972a2..12552ce7 100644
--- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
@@ -5,6 +5,13 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+	<ui:fragment rendered="#{empty targetController}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
+
 	<ui:fragment rendered="#{not empty targetController}">
 		<h:selectOneMenu styleClass="select right_space" id="phoneCountry" value="#{targetController.phoneCountry}">
 			<f:converter converterId="CountryConverter" />
@@ -20,6 +27,4 @@
 			<f:validator validatorId="PhoneNumberValidator" />
 		</h:inputText>
 	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
 </ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
index 4ce34ff6..536bfecc 100644
--- a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
@@ -5,6 +5,13 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+	<ui:fragment rendered="#{empty targetController}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
+
 	<ui:fragment rendered="#{not empty targetController}">
 		<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.phoneCountry}">
 			<f:converter converterId="CountryConverter" />
@@ -20,6 +27,4 @@
 			<f:validator validatorId="PhoneNumberValidator" />
 		</h:inputText>
 	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
 </ui:composition>
diff --git a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
index 8307a100..4ed66357 100644
--- a/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/mobile_input_fields.tpl
@@ -5,6 +5,13 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
+	<ui:fragment rendered="#{empty targetController}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
+
 	<ui:fragment rendered="#{not empty targetController}">
 		<h:selectOneMenu styleClass="select right_space" id="mobileProvider" value="#{targetController.mobileProvider}">
 			<f:converter converterId="MobileProviderConverter" />
@@ -16,6 +23,4 @@
 			<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
 		</h:inputText>
 	</ui:fragment>
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" rendered="#{empty targetController}" />
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index f394ec0d..8fc3f32c 100644
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -14,7 +14,10 @@
 			<ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
 		</ui:fragment>
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-			<h:outputText styleClass="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
+			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+				<ui:param name="message" value="#{msg.USER_NOT_LOGGED_IN}" />
+				<ui:param name="styleClass" value="errors" />
+			</ui:include>
 		</ui:fragment>
 	</ui:define>
 
diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl
index 6188f9c1..e85accf1 100644
--- a/web/WEB-INF/templates/user/user_profile_link.tpl
+++ b/web/WEB-INF/templates/user/user_profile_link.tpl
@@ -5,7 +5,12 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:outputText styleClass="notice" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty user}" />
+	<ui:fragment rendered="#{empty user}">
+		<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+			<ui:param name="message" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" />
+			<ui:param name="styleClass" value="errors" />
+		</ui:include>
+	</ui:fragment>
 
 	<h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index a7bc592c..9707352b 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -24,7 +24,12 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
+			<ui:fragment rendered="#{empty beanHelper.contact}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
 				<h:panelGroup styleClass="table" layout="block">
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index cfe2f735..000a0b7d 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -24,7 +24,12 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
+			<ui:fragment rendered="#{empty beanHelper.contact}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
 				<h:panelGroup styleClass="table_medium" layout="block">
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index ae78b819..3f442a3e 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -18,8 +18,15 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:form id="form_export_contacts">
-				<p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
+			<ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
+
+			<h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
+				<p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
 					<p:column exportable="false">
 						<f:facet name="header">
 							<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 6e6879cc..4e9467b5 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -17,7 +17,12 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}"rendered="#{userController.allUsers().isEmpty()}" />
+			<ui:fragment rendered="#{contactController.allContacts().isEmpty()}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ADMIN_CONTACT_LIST_EMPTY}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
 				<h:column>
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index ed1ce535..b8368b89 100644
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -24,7 +24,12 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty beanHelper.contact}" />
+			<ui:fragment rendered="#{empty beanHelper.contact}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<ui:fragment rendered="#{not empty beanHelper.contact}">
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 348a479d..92b938f3 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -54,9 +54,19 @@
 				</h:panelGroup>
 			</h:form>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+			<ui:fragment rendered="#{empty beanHelper.faxNumber}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+			<ui:fragment rendered="#{empty beanHelper.contact}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
 				<f:param value="#{beanHelper.faxNumber.phoneId}" />
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index 933d7e71..83c4aec9 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -54,9 +54,19 @@
 				</h:panelGroup>
 			</h:form>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+			<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+			<ui:fragment rendered="#{empty beanHelper.contact}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
 				<f:param value="#{beanHelper.landLineNumber.phoneId}" />
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 417485ac..ef2a67d5 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -54,9 +54,19 @@
 				</h:panelGroup>
 			</h:form>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+			<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+			<ui:fragment rendered="#{empty beanHelper.contact}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
 				<f:param value="#{beanHelper.mobileNumber.phoneId}" />
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index d16f4886..6c575941 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -46,7 +46,12 @@
 				</h:panelGroup>
 			</h:form>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+			<ui:fragment rendered="#{empty beanHelper.faxNumber}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index df002629..984dcfe2 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -41,7 +41,12 @@
 				</h:panelGroup>
 			</h:form>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" rendered="#{empty beanHelper.faxNumber}" />
+			<ui:fragment rendered="#{empty beanHelper.faxNumber}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index ee4f4ceb..2f621cc4 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -58,7 +58,12 @@
 				</h:column>
 			</h:dataTable>
 
-			<h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
+			<ui:fragment rendered="#{phoneController.allFaxNumbers().isEmpty()}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index 193d26b7..a3a1bbba 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -46,7 +46,12 @@
 				</h:panelGroup>
 			</h:form>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+			<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 0cd4560e..ce87dc57 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -41,7 +41,12 @@
 				</h:panelGroup>
 			</h:form>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.landLineNumber}" />
+			<ui:fragment rendered="#{empty beanHelper.landLineNumber}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index f03f6bae..354478e6 100644
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -58,7 +58,12 @@
 				</h:column>
 			</h:dataTable>
 
-			<h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" rendered="#{phoneController.allLandLineNumbers().isEmpty()}" />
+			<ui:fragment rendered="#{phoneController.allLandLineNumbers().isEmpty()}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index 401efee6..de23aa3f 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -46,7 +46,12 @@
 				</h:panelGroup>
 			</h:form>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+			<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index f8062a1f..88328ed0 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -41,7 +41,12 @@
 				</h:panelGroup>
 			</h:form>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" rendered="#{empty beanHelper.mobileNumber}" />
+			<ui:fragment rendered="#{empty beanHelper.mobileNumber}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index 54b1fc6b..6c4dcad1 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -69,7 +69,12 @@
 				</h:column>
 			</h:dataTable>
 
-			<h:outputText styleClass="errors" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
+			<ui:fragment rendered="#{phoneController.allMobileNumbers().isEmpty()}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ADMIN_LIST_MOBILE_EMPTY}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index 7ae2cb45..b2e157aa 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -24,7 +24,12 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+			<ui:fragment rendered="#{empty beanHelper.user}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			Here goes your content.
 		</ui:define>
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 67917375..cdb343e0 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -25,16 +25,21 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+			<ui:fragment rendered="#{empty beanHelper.user}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
 				<h:panelGroup styleClass="table" layout="block">
 					<div class="table_header">
-						#{msg.ADMIN_EDIT_USER_TITLE}
+						<h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
 					</div>
 
 					<div class="para notice">
-						#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
+						<h:outputText value="#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}" />
 					</div>
 
 					<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index dab2e8f1..49638be8 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -17,8 +17,15 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:form id="form_export_users">
-				<p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}" rendered="#{not userController.allUsers().isEmpty()}">
+			<ui:fragment rendered="#{userController.allUsers().isEmpty()}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
+
+			<h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
+				<p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
 					<p:column exportable="false">
 						<f:facet name="header">
 							<h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 4d348cdd..6f1a07e1 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -17,7 +17,10 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ADMIN_USER_LIST_EMPTY}"rendered="#{userController.allUsers().isEmpty()}" />
+			<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+				<ui:param name="message" value="#{msg.ADMIN_USER_LIST_EMPTY}" />
+				<ui:param name="styleClass" value="errors" />
+			</ui:include>
 
 			<h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
 				<h:column>
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 39977d14..548f8898 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -25,7 +25,12 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputFormat styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+			<ui:fragment rendered="#{empty beanHelper.user}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
 				<h:panelGroup styleClass="table_medium" layout="block">
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index e96b1601..cbe6b44a 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -24,7 +24,12 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+			<ui:fragment rendered="#{empty beanHelper.user}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 6963266e..95e4cca6 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -24,7 +24,12 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty beanHelper.user}" />
+			<ui:fragment rendered="#{empty beanHelper.user}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_USER_ID_NOT_FOUND}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
 				<h:panelGroup styleClass="table_medium" layout="block">
diff --git a/web/guest/user/confirm_account.xhtml b/web/guest/user/confirm_account.xhtml
index 0fde6a06..f394d378 100644
--- a/web/guest/user/confirm_account.xhtml
+++ b/web/guest/user/confirm_account.xhtml
@@ -39,11 +39,19 @@
 					</div>
 				</h:panelGroup>
 
-				<h:outputText styleClass="errors" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" rendered="#{empty beanHelper.user}" />
+				<ui:fragment rendered="#{empty beanHelper.user}">
+					<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+						<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" />
+						<ui:param name="styleClass" value="errors" />
+					</ui:include>
+				</ui:fragment>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{empty confirmationLinkController.confirmationKey}">
-				<h:outputText styleClass="errors" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index 0e710276..1419666b 100644
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -38,7 +38,10 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required')}">
-				<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
index d7db1d12..2d6a6a06 100644
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -70,7 +70,10 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_name_required') or not featureController.isFeatureEnabled('user_password_recovery')}">
-				<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
diff --git a/web/guest/user/register.xhtml b/web/guest/user/register.xhtml
index 1bf51168..340b6981 100644
--- a/web/guest/user/register.xhtml
+++ b/web/guest/user/register.xhtml
@@ -40,7 +40,10 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_registration')}">
-				<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
diff --git a/web/guest/user/register_page2.xhtml b/web/guest/user/register_page2.xhtml
index 4737d087..35557e62 100644
--- a/web/guest/user/register_page2.xhtml
+++ b/web/guest/user/register_page2.xhtml
@@ -32,7 +32,10 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}">
-				<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
diff --git a/web/guest/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
index da489ba5..b1fc24bf 100644
--- a/web/guest/user/resend_link.xhtml
+++ b/web/guest/user/resend_link.xhtml
@@ -56,13 +56,12 @@
 				</h:panelGroup>
 			</h:form>
 
-			<<<<<<< HEAD
-			<ui:fragment rendered="#{not registerController.isResendConfirmationLinkEnabled()}">
-				<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" />
+			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
 			</ui:fragment>
-			=======
-			<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
-			>>>>>>> de7e9f0... Continued a bit: (please cherry-pick)
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index c07179ad..38fcfdbc 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -36,7 +36,12 @@
 				</h:dataTable>
 			</h:panelGroup>>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_LIST_DISABLED}" rendered="#{featureController.isFeatureEnabled('user_list')}" />
+			<ui:fragment rendered="#{not featureController.isFeatureEnabled('user_list')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_USER_LIST_DISABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index 5428ccd4..55f8af2a 100644
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -34,7 +34,12 @@
 					<ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
 				</ui:fragment>
 
-				<h:outputText value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
+				<ui:fragment rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}">
+					<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+						<ui:param name="message" value="#{msg.ERROR_PROFILE_NOT_VISIBLE}" />
+						<ui:param name="styleClass" value="errors" />
+					</ui:include>
+				</ui:fragment>
 
 				<ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
 					<div align="center">
@@ -48,7 +53,10 @@
 			</ui:fragment>
 
 			<ui:fragment rendered="#{not userController.isPublicUserProfileEnabled()}">
-				<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
 			</ui:fragment>
 		</ui:define>
 	</ui:composition>
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 551dcc80..2e17a3a8 100644
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -54,7 +54,12 @@
 				</h:form>
 			</h:panelGroup>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+			<ui:fragment rendered="#{not featureController.isFeatureEnabled('edit_user_data')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
 				<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index fc370b84..254d07c8 100644
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -90,7 +90,12 @@
 				</h:panelGroup>
 			</ui:fragment>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+			<ui:fragment rendered="#{not featureController.isFeatureEnabled('change_user_password')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
index 75590cdf..17760ecb 100644
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -36,7 +36,12 @@
 				</h:form>
 			</h:panelGroup>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+			<ui:fragment rendered="#{not featureController.isFeatureEnabled('edit_user_data')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
 				<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index d2b1e88c..75d6b04d 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -27,7 +27,12 @@
 				<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
 			</ui:fragment>
 
-			<h:outputText styleClass="errors" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+			<ui:fragment rendered="#{not featureController.isFeatureEnabled('edit_user_data')}">
+				<ui:include src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" />
+					<ui:param name="styleClass" value="errors" />
+				</ui:include>
+			</ui:fragment>
 
 			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 				<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />