From c4af0b020794b21aad505d1cc700e2f081a10009 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Thu, 5 May 2016 16:03:18 +0200
Subject: [PATCH] re-organized pages: - moved /user/ -> /guest/user/ as these
 are pages for current guest but later users - moved /login/ -> /user/ as
 these are pages for current (logged-in) users
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 nbproject/faces-config.NavData                | 110 ++++++------
 web/WEB-INF/faces-config.xml                  |  60 ++++---
 .../templates.dist/guest_login_page.xhtml     |  44 ++---
 web/admin/contact/admin_contact_delete.xhtml  |  96 +++++------
 web/admin/contact/admin_contact_edit.xhtml    | 100 +++++------
 web/admin/country/admin_country_list.xhtml    | 140 ++++++++--------
 .../admin_mobile_provider_list.xhtml          | 156 +++++++++---------
 web/{ => guest}/user/login.xhtml              |   0
 web/{ => guest}/user/login_error.xhtml        |   0
 web/{ => guest}/user/lost_passwd.xhtml        | 136 +++++++--------
 web/{ => guest}/user/register.xhtml           |   0
 web/{ => guest}/user/register_done.xhtml      |   0
 web/{ => guest}/user/resend_link.xhtml        |   0
 web/{ => guest}/user/show_addressbook.xhtml   | 112 ++++++-------
 .../user/show_addressbook_entries.xhtml       |   0
 web/{ => guest}/user/user_list.xhtml          |   0
 web/{ => guest}/user/user_profile.xhtml       |  96 +++++------
 web/imprint.xhtml                             |  44 ++---
 web/privacy.xhtml                             |  44 ++---
 web/terms.xhtml                               |  44 ++---
 .../login_add_addressbook.xhtml               | 102 ++++++------
 .../login_change_email_address.xhtml          |   0
 .../login_change_password.xhtml               | 142 ++++++++--------
 .../login_change_personal_data.xhtml          |   0
 .../login_contact_data_saved.xhtml            |  60 +++----
 web/{login => user}/login_data_saved.xhtml    |  60 +++----
 .../login_edit_user_data.xhtml                | 100 +++++------
 web/{login => user}/login_index.xhtml         |  56 +++----
 .../login_own_addressbooks.xhtml              | 134 +++++++--------
 .../login_user_data_saved.xhtml               |  60 +++----
 30 files changed, 945 insertions(+), 951 deletions(-)
 rename web/{ => guest}/user/login.xhtml (100%)
 rename web/{ => guest}/user/login_error.xhtml (100%)
 rename web/{ => guest}/user/lost_passwd.xhtml (97%)
 rename web/{ => guest}/user/register.xhtml (100%)
 rename web/{ => guest}/user/register_done.xhtml (100%)
 rename web/{ => guest}/user/resend_link.xhtml (100%)
 rename web/{ => guest}/user/show_addressbook.xhtml (98%)
 rename web/{ => guest}/user/show_addressbook_entries.xhtml (100%)
 rename web/{ => guest}/user/user_list.xhtml (100%)
 rename web/{ => guest}/user/user_profile.xhtml (97%)
 rename web/{login => user}/login_add_addressbook.xhtml (97%)
 rename web/{login => user}/login_change_email_address.xhtml (100%)
 rename web/{login => user}/login_change_password.xhtml (97%)
 rename web/{login => user}/login_change_personal_data.xhtml (100%)
 rename web/{login => user}/login_contact_data_saved.xhtml (97%)
 rename web/{login => user}/login_data_saved.xhtml (97%)
 rename web/{login => user}/login_edit_user_data.xhtml (97%)
 rename web/{login => user}/login_index.xhtml (97%)
 rename web/{login => user}/login_own_addressbooks.xhtml (98%)
 rename web/{login => user}/login_user_data_saved.xhtml (97%)

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 599d7838..f4cc90c5 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,62 +2,60 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
-        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1150" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_show.xhtml" x="1650" y="300" zoom="true"/>
-        <Node id="login/login_change_password.xhtml" x="150" y="900" zoom="true"/>
-        <Node id="privacy.xhtml" x="1650" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1650" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_show.xhtml" x="900" y="1050" zoom="true"/>
-        <Node id="admin/index.xhtml" x="1900" y="450" zoom="true"/>
-        <Node id="user/resend_link.xhtml" x="1400" y="750" zoom="true"/>
-        <Node id="user/index.xhtml" x="650" y="1050" zoom="true"/>
-        <Node id="admin/admin_logout.xhtml" x="1150" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_unlock.xhtml" x="1400" y="600" zoom="true"/>
-        <Node id="index.xhtml" x="650" y="1200" zoom="true"/>
-        <Node id="user/register_done.xhtml" x="1400" y="150" zoom="true"/>
-        <Node id="admin/admin_category_delete.xhtml" x="650" y="750" zoom="true"/>
-        <Node id="*" x="2400" y="150" zoom="true"/>
-        <Node id="user/login_error.xhtml" x="150" y="1500" zoom="true"/>
-        <Node id="user/login_index.xhtml" x="400" y="1200" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="150" y="1350" zoom="true"/>
-        <Node id="user/show_addressbook_entries.xhtml" x="150" y="300" zoom="true"/>
-        <Node id="user/lost_passwd.xhtml" x="650" y="300" zoom="true"/>
-        <Node id="user/login.xhtml" x="150" y="1050" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="900" y="300" zoom="true"/>
-        <Node id="login/login_contact_data_saved.xhtml" x="1150" y="300" zoom="true"/>
-        <Node id="admin/country/admin_country_list.xhtml" x="900" y="900" zoom="true"/>
-        <Node id="login/login_edit_user_data.xhtml" x="2650" y="150" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="1150" y="600" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="650" y="450" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="750" zoom="true"/>
-        <Node id="login/login_data_saved.xhtml" x="1400" y="300" zoom="true"/>
-        <Node id="admin/user/admin_user_delete.xhtml" x="400" y="1050" zoom="true"/>
-        <Node id="exception.xhtml" x="150" y="1200" zoom="true"/>
-        <Node id="user/register.xhtml" x="900" y="450" zoom="true"/>
-        <Node id="login/login_index.xhtml" x="150" y="150" zoom="true"/>
-        <Node id="login/login_add_addressbook.xhtml" x="1150" y="450" zoom="true"/>
-        <Node id="login/login_own_addressbooks.xhtml" x="1900" y="150" zoom="true"/>
-        <Node id="admin/user/admin_user_edit.xhtml" x="900" y="750" zoom="true"/>
-        <Node id="terms.xhtml" x="150" y="750" zoom="true"/>
-        <Node id="admin/contact/admin_contact_edit.xhtml" x="1900" y="300" zoom="true"/>
-        <Node id="admin/contact/admin_contact_list.xhtml" x="1650" y="450" zoom="true"/>
-        <Node id="admin/user/admin_user_list.xhtml" x="650" y="900" zoom="true"/>
-        <Node id="admin/admin_user_add.xhtml" x="1150" y="900" zoom="true"/>
-        <Node id="admin/country/admin_country_delete.xhtml" x="400" y="450" zoom="true"/>
-        <Node id="login/login_user_data_saved.xhtml" x="900" y="600" zoom="true"/>
-        <Node id="user/user_list.xhtml" x="1400" y="450" zoom="true"/>
-        <Node id="admin/country/admin_country_edit.xhtml" x="400" y="300" zoom="true"/>
-        <Node id="logout.xhtml" x="400" y="900" zoom="true"/>
-        <Node id="admin/contact/admin_contact_delete.xhtml" x="400" y="150" zoom="true"/>
-        <Node id="user/user_profile.xhtml" x="150" y="450" zoom="true"/>
-        <Node id="login/login_change_personal_data.xhtml" x="400" y="1350" zoom="true"/>
-        <Node id="user/show_addressbook.xhtml" x="900" y="150" zoom="true"/>
-        <Node id="imprint.xhtml" x="2150" y="300" zoom="true"/>
-        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="600" zoom="true"/>
-        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="150" y="600" zoom="true"/>
-        <Node id="guest/user/login.xhtml" x="650" y="150" zoom="true"/>
-        <Node id="admin/admin_product_delete.xhtml" x="2150" y="150" zoom="true"/>
-        <Node id="login/login_change_email_address.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="650" y="1200" zoom="true"/>
+        <Node id="privacy.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="guest/user/show_addressbook.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="admin/index.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/login_own_addressbooks.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="user/login_user_data_saved.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="user/login_data_saved.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="index.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="guest/user/user_list.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="user/login_edit_user_data.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="admin/admin_category_delete.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="*" x="150" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="user/login_index.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="guest/user/lost_passwd.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="guest/user/register_done.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="guest/user/show_addressbook_entries.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="admin/country/admin_country_list.xhtml" x="900" y="1050" zoom="true"/>
+        <Node id="guest/user/login_error.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="user/login_change_password.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="guest/user/user_profile.xhtml" x="1400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="exception.xhtml" x="1150" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="2150" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="admin/contact/admin_contact_edit.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/contact/admin_contact_list.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/admin_user_add.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/country/admin_country_delete.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="user/login_change_personal_data.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="logout.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/country/admin_country_edit.xhtml" x="1150" y="450" zoom="true"/>
+        <Node id="guest/user/resend_link.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="user/login_add_addressbook.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="user/login_contact_data_saved.xhtml" x="2150" y="300" zoom="true"/>
+        <Node id="admin/contact/admin_contact_delete.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="imprint.xhtml" x="400" y="1350" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="guest/user/login.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="admin/admin_product_delete.xhtml" x="1650" y="600" zoom="true"/>
+        <Node id="guest/user/register.xhtml" x="1900" y="450" zoom="true"/>
+        <Node id="user/login_change_email_address.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="user/login/login_data_saved.xhtml" x="1150" y="150" zoom="true"/>
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 36e24c4a..ab03d890 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -21,15 +21,15 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_register</from-outcome>
-			<to-view-id>/user/register.xhtml</to-view-id>
+			<to-view-id>/guest/user/register.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_login</from-outcome>
-			<to-view-id>/user/login.xhtml</to-view-id>
+			<to-view-id>/guest/user/login.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_lost_passwd</from-outcome>
-			<to-view-id>/user/lost_passwd.xhtml</to-view-id>
+			<to-view-id>/guest/user/lost_passwd.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>terms</from-outcome>
@@ -53,11 +53,11 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>login_index</from-outcome>
-			<to-view-id>/login/login_index.xhtml</to-view-id>
+			<to-view-id>/user/login_index.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_resend_link</from-outcome>
-			<to-view-id>/user/resend_link.xhtml</to-view-id>
+			<to-view-id>/guest/user/resend_link.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_logout</from-outcome>
@@ -89,18 +89,18 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>login_edit_user_data</from-outcome>
-			<to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
+			<to-view-id>/user/login_edit_user_data.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_profile</from-outcome>
-			<to-view-id>/user/user_profile.xhtml</to-view-id>
+			<to-view-id>/guest/user/user_profile.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/user/login.xhtml</from-view-id>
+		<from-view-id>/guest/user/login.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>login</from-outcome>
-			<to-view-id>/login/login_index.xhtml</to-view-id>
+			<to-view-id>/user/login_index.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_add_user</from-outcome>
@@ -109,20 +109,16 @@
 	</navigation-rule>
 	<navigation-rule>
 		<from-view-id>/guest/user/login.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>login</from-outcome>
-			<to-view-id>/user/login_index.xhtml</to-view-id>
-		</navigation-case>
 		<navigation-case>
 			<from-outcome>login_index</from-outcome>
-			<to-view-id>/user/index.xhtml</to-view-id>
+			<to-view-id>/user/login_index.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/user/register.xhtml</from-view-id>
+		<from-view-id>/guest/user/register.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>register_done</from-outcome>
-			<to-view-id>/user/register_done.xhtml</to-view-id>
+			<to-view-id>/guest/user/register_done.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
@@ -133,47 +129,47 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/login/login_own_addressbooks.xhtml</from-view-id>
+		<from-view-id>/user/login_own_addressbooks.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>login_add_addressbook</from-outcome>
-			<to-view-id>/login/login_add_addressbook.xhtml</to-view-id>
+			<to-view-id>/user/login_add_addressbook.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>user_show_addressbook</from-outcome>
-			<to-view-id>/user/show_addressbook.xhtml</to-view-id>
+			<to-view-id>/guest/user/show_addressbook.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>show_addressbook_entries</from-outcome>
-			<to-view-id>/user/show_addressbook_entries.xhtml</to-view-id>
+			<to-view-id>/guest/user/show_addressbook_entries.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/login/login_edit_user_data.xhtml</from-view-id>
+		<from-view-id>/user/login_edit_user_data.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>login_change_email_address</from-outcome>
-			<to-view-id>/login/login_change_email_address.xhtml</to-view-id>
+			<to-view-id>/user/login_change_email_address.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>login_change_password</from-outcome>
-			<to-view-id>/login/login_change_password.xhtml</to-view-id>
+			<to-view-id>/user/login_change_password.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>login_change_personal_data</from-outcome>
-			<to-view-id>/login/login_change_personal_data.xhtml</to-view-id>
+			<to-view-id>/user/login_change_personal_data.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/login/login_change_password.xhtml</from-view-id>
+		<from-view-id>/user/login_change_password.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>login_data_saved</from-outcome>
-			<to-view-id>/login/login_data_saved.xhtml</to-view-id>
+			<from-outcome>user_data_saved</from-outcome>
+			<to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/login/login_change_email_address.xhtml</from-view-id>
+		<from-view-id>/user/login_change_email_address.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>contact_data_saved</from-outcome>
-			<to-view-id>/login/login_contact_data_saved.xhtml</to-view-id>
+			<to-view-id>/user/login_contact_data_saved.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_product</from-outcome>
@@ -181,10 +177,10 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/login/login_change_personal_data.xhtml</from-view-id>
+		<from-view-id>/user/login_change_personal_data.xhtml</from-view-id>
 		<navigation-case>
-			<from-outcome>login_data_saved</from-outcome>
-			<to-view-id>/login/login_data_saved.xhtml</to-view-id>
+			<from-outcome>contact_data_saved</from-outcome>
+			<to-view-id>/user/login/login_data_saved.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_category</from-outcome>
diff --git a/web/WEB-INF/templates.dist/guest_login_page.xhtml b/web/WEB-INF/templates.dist/guest_login_page.xhtml
index 2e7bc380..8a38263b 100644
--- a/web/WEB-INF/templates.dist/guest_login_page.xhtml
+++ b/web/WEB-INF/templates.dist/guest_login_page.xhtml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_FOO}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_FOO}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_INDEX_FOO}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 130d20d6..badc92e3 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
-
-	<f:metadata>
-		<f:viewParam name="contactId" value="#{adminHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-		<f:viewAction action="#{adminHelper.copyContactToController()}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty adminHelper.contact}" />
-
-			<h:form id="admin_edit_user" rendered="#{not empty adminHelper.contact}">
-				<div class="table">
-					<div class="table_header">
-						<h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
-							<f:param value="#{adminHelper.contact.contactId}" />
-						</h:outputFormat>
-					</div>
-
-					<div class="para notice">
-						#{msg.ADMIN_DELETE_CONTACT_NOTICE}
-					</div>
-
-					<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
-
-					<div class="table_footer">
-						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton styleClass="delete_button" type="submit" id="register" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
-					</div>
-				</div>
-			</h:form>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<f:metadata>
+		<f:viewParam name="contactId" value="#{adminHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+		<f:viewAction action="#{adminHelper.copyContactToController()}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CONTACT}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty adminHelper.contact}" />
+
+			<h:form id="admin_edit_user" rendered="#{not empty adminHelper.contact}">
+				<div class="table">
+					<div class="table_header">
+						<h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
+							<f:param value="#{adminHelper.contact.contactId}" />
+						</h:outputFormat>
+					</div>
+
+					<div class="para notice">
+						#{msg.ADMIN_DELETE_CONTACT_NOTICE}
+					</div>
+
+					<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
+
+					<div class="table_footer">
+						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="delete_button" type="submit" id="register" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
+					</div>
+				</div>
+			</h:form>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 299b3308..0ac502ad 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
-
-	<f:metadata>
-		<f:viewParam name="contactId" value="#{adminHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-		<f:viewAction action="#{adminHelper.copyContactToController()}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty adminHelper.contact}" />
-
-			<h:form id="admin_edit_user" rendered="#{not empty adminHelper.contact}">
-				<div class="table">
-					<div class="table_header">
-						<h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
-							<f:param value="#{adminHelper.contact.contactId}" />
-						</h:outputFormat>
-					</div>
-
-					<div class="para notice">
-						#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}
-					</div>
-
-					<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
-						<ui:param name="mode" value="edit" />
-					</ui:include>
-
-					<div class="table_footer">
-						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
-					</div>
-				</div>
-			</h:form>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<f:metadata>
+		<f:viewParam name="contactId" value="#{adminHelper.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+		<f:viewAction action="#{adminHelper.copyContactToController()}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CONTACT}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:outputText styleClass="errors" value="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" rendered="#{empty adminHelper.contact}" />
+
+			<h:form id="admin_edit_user" rendered="#{not empty adminHelper.contact}">
+				<div class="table">
+					<div class="table_header">
+						<h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
+							<f:param value="#{adminHelper.contact.contactId}" />
+						</h:outputFormat>
+					</div>
+
+					<div class="para notice">
+						#{msg.ADMIN_CONTACT_PERSONAL_DATA_MINIMUM_NOTICE}
+					</div>
+
+					<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl">
+						<ui:param name="mode" value="edit" />
+					</ui:include>
+
+					<div class="table_footer">
+						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
+					</div>
+				</div>
+			</h:form>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index a31a09dc..63cda07c 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
-
-	<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="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:dataTable id="table_list_countries" var="country" value="#{adminCountryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{adminCountryController.hasCountries()}">
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}</f:facet>
-
-					<h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
-						<f:param name="countryId" value="#{country.countryId}" />
-					</h:link>
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}</f:facet>
-
-					<h:outputText value="#{country.countryCode}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}</f:facet>
-
-					<h:outputText value="#{country.countryExternalDialPrefix}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}</f:facet>
-
-					<h:outputText value="#{msg[country.countryI18nkey]}" />
-				</h:column>
-			</h:dataTable>
-
-			<h:form id="add_country">
-				<div class="table_medium">
-					<div class="table_header">
-						#{msg.ADMIN_ADD_COUNTRY_TITLE}
-					</div>
-
-					<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
-
-					<div class="table_footer">
-						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
-					</div>
-				</div>
-
-				<div class="para notice">
-					#{msg.ADMIN_ADD_COUNTRY_NOTICES}
-					<ul>
-						<li>#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}</li>
-					</ul>
-				</div>
-			</h:form>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<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="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:dataTable id="table_list_countries" var="country" value="#{adminCountryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{adminCountryController.hasCountries()}">
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}</f:facet>
+
+					<h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
+						<f:param name="countryId" value="#{country.countryId}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}</f:facet>
+
+					<h:outputText value="#{country.countryCode}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}</f:facet>
+
+					<h:outputText value="#{country.countryExternalDialPrefix}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}</f:facet>
+
+					<h:outputText value="#{msg[country.countryI18nkey]}" />
+				</h:column>
+			</h:dataTable>
+
+			<h:form id="add_country">
+				<div class="table_medium">
+					<div class="table_header">
+						#{msg.ADMIN_ADD_COUNTRY_TITLE}
+					</div>
+
+					<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
+
+					<div class="table_footer">
+						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
+					</div>
+				</div>
+
+				<div class="para notice">
+					#{msg.ADMIN_ADD_COUNTRY_NOTICES}
+					<ul>
+						<li>#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}</li>
+					</ul>
+				</div>
+			</h:form>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index cda953ca..9d03373c 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
-
-	<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="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:dataTable id="table_list_mobile" var="mobile" value="#{adminMobileProviderController.allMobileProvider()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{adminMobileProviderController.hasMobileProvider()}">
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}</f:facet>
-
-					<h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
-						<f:param name="providerId" value="#{mobile.providerId}" />
-					</h:link>
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}</f:facet>
-
-					<h:outputText value="#{mobile.providerName}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}</f:facet>
-
-					<h:outputText value="#{mobile.providerDialPrefix}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}</f:facet>
-
-					<h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}</f:facet>
-
-					<h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
-						<f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
-					</h:outputText>
-				</h:column>
-			</h:dataTable>
-
-			<h:form id="add_provider">
-				<div class="table_medium">
-					<div class="table_header">
-						#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}
-					</div>
-
-					<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
-
-					<div class="table_footer">
-						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
-					</div>
-				</div>
-
-				<div class="para notice">
-					#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}
-					<ul>
-						<li>#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}</li>
-					</ul>
-				</div>
-			</h:form>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<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="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:dataTable id="table_list_mobile" var="mobile" value="#{adminMobileProviderController.allMobileProvider()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{adminMobileProviderController.hasMobileProvider()}">
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}</f:facet>
+
+					<h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
+						<f:param name="providerId" value="#{mobile.providerId}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}</f:facet>
+
+					<h:outputText value="#{mobile.providerName}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}</f:facet>
+
+					<h:outputText value="#{mobile.providerDialPrefix}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}</f:facet>
+
+					<h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}</f:facet>
+
+					<h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
+						<f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</h:column>
+			</h:dataTable>
+
+			<h:form id="add_provider">
+				<div class="table_medium">
+					<div class="table_header">
+						#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}
+					</div>
+
+					<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
+
+					<div class="table_footer">
+						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
+					</div>
+				</div>
+
+				<div class="para notice">
+					#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}
+					<ul>
+						<li>#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}</li>
+					</ul>
+				</div>
+			</h:form>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/user/login.xhtml b/web/guest/user/login.xhtml
similarity index 100%
rename from web/user/login.xhtml
rename to web/guest/user/login.xhtml
diff --git a/web/user/login_error.xhtml b/web/guest/user/login_error.xhtml
similarity index 100%
rename from web/user/login_error.xhtml
rename to web/guest/user/login_error.xhtml
diff --git a/web/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
similarity index 97%
rename from web/user/lost_passwd.xhtml
rename to web/guest/user/lost_passwd.xhtml
index 94b9f73b..103e070c 100644
--- a/web/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<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="content_header">
-			#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
-		</ui:define>
-
-		<ui:define name="content">
-			<div class="para" id="user_lost_password_content">
-				<h:form id="lost_password_form">
-					<div class="table">
-						<div class="table_header">
-							#{msg.GUEST_LOST_PASSWORD_TITLE}
-						</div>
-
-						<fieldset id="login_data">
-							<legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">#{msg.GUEST_LOST_PASSWORD_LEGEND}</legend>
-
-							<div class="table_row">
-								<div class="table_left">
-									<h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
-								</div>
-
-								<div class="table_right">
-									<h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
-								</div>
-
-								<div class="clear"></div>
-							</div>
-
-							<div class="table_header">
-								#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}
-							</div>
-
-							<div class="table_row">
-								<div class="table_left">
-									<h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
-								</div>
-
-								<div class="table_right">
-									<h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
-								</div>
-
-								<div class="clear"></div>
-							</div>
-
-						</fieldset>
-
-						<div class="table_footer">
-							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
-						</div>
-					</div>
-				</h:form>
-			</div>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<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="content_header">
+			#{msg.CONTENT_TITLE_USER_LOST_PASSWORD}
+		</ui:define>
+
+		<ui:define name="content">
+			<div class="para" id="user_lost_password_content">
+				<h:form id="lost_password_form">
+					<div class="table">
+						<div class="table_header">
+							#{msg.GUEST_LOST_PASSWORD_TITLE}
+						</div>
+
+						<fieldset id="login_data">
+							<legend title="#{msg.GUEST_LOST_PASSWORD_LEGEND_TITLE}">#{msg.GUEST_LOST_PASSWORD_LEGEND}</legend>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+							<div class="table_header">
+								#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}
+							</div>
+
+							<div class="table_row">
+								<div class="table_left">
+									<h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
+								</div>
+
+								<div class="table_right">
+									<h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+								</div>
+
+								<div class="clear"></div>
+							</div>
+
+						</fieldset>
+
+						<div class="table_footer">
+							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+							<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
+						</div>
+					</div>
+				</h:form>
+			</div>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/user/register.xhtml b/web/guest/user/register.xhtml
similarity index 100%
rename from web/user/register.xhtml
rename to web/guest/user/register.xhtml
diff --git a/web/user/register_done.xhtml b/web/guest/user/register_done.xhtml
similarity index 100%
rename from web/user/register_done.xhtml
rename to web/guest/user/register_done.xhtml
diff --git a/web/user/resend_link.xhtml b/web/guest/user/resend_link.xhtml
similarity index 100%
rename from web/user/resend_link.xhtml
rename to web/guest/user/resend_link.xhtml
diff --git a/web/user/show_addressbook.xhtml b/web/guest/user/show_addressbook.xhtml
similarity index 98%
rename from web/user/show_addressbook.xhtml
rename to web/guest/user/show_addressbook.xhtml
index ad10b3f0..6095ec33 100644
--- a/web/user/show_addressbook.xhtml
+++ b/web/guest/user/show_addressbook.xhtml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core">
-
-	<f:metadata>
-		<f:viewParam id="addressbookId" name="addressbookId" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">
-			<f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-			<f:validator for="addressbookId" validatorId="AddressbookIdValidator" />
-		</f:viewParam>
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadAddressbook()}">
-				<f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
-
-				<h:outputLabel for="addressbookName" styleClass="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
-				<h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
-
-				<h:outputLabel for="userProfileLink" styleClass="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
-				<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
-					<ui:param name="user" value="#{addressbookController.addressbookUser}" />
-				</ui:include>
-
-				<h:outputLabel for="addressbookCreated" styleClass="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
-				<h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
-					<f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
-				</h:outputFormat>
-
-				<h:outputLabel for="addressbookStatus" styleClass="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>
-				<h:outputText id="addressbookStatus" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />
-
-				<f:facet name="footer">
-					<h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not userLoginController.isUserLoggedIn()}" />
-					<h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{userLoginController.isUserLoggedIn() and userLoginController.isInvisible()}" />
-
-					<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.isInvisible()}">
-						<h:outputText value="Bla bla" rendered="#{addressbookController.isOtherAddressbook()}" />
-					</ui:fragment>
-				</f:facet>
-			</h:panelGrid>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+	<f:metadata>
+		<f:viewParam id="addressbookId" name="addressbookId" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">
+			<f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
+			<f:validator for="addressbookId" validatorId="AddressbookIdValidator" />
+		</f:viewParam>
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+		<ui:define name="login_title">#{msg.PAGE_TITLE_USER_SHOW_ADDRESSBOOK}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_ADDRESSBOOK}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_USER_SHOW_ADDRESSBOOK}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:panelGrid headerClass="table_header" styleClass="table" columns="2" rendered="#{addressbookController.loadAddressbook()}">
+				<f:facet name="header">#{msg.TABLE_HEADER_SHOW_ADDRESSBOOK}</f:facet>
+
+				<h:outputLabel for="addressbookName" styleClass="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
+				<h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
+
+				<h:outputLabel for="userProfileLink" styleClass="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
+				<ui:include src="/WEB-INF/templates/generic/user_profile_link.tpl">
+					<ui:param name="user" value="#{addressbookController.addressbookUser}" />
+				</ui:include>
+
+				<h:outputLabel for="addressbookCreated" styleClass="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
+				<h:outputFormat id="addressbookCreated" value="#{addressbookController.addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
+					<f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
+				</h:outputFormat>
+
+				<h:outputLabel for="addressbookStatus" styleClass="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>
+				<h:outputText id="addressbookStatus" value="#{msg[addressbookController.addressbook.addressbookStatus.messageKey]}" title="#{msg.ADDRESSBOOK_STATUS_TITLE}" />
+
+				<f:facet name="footer">
+					<h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not userLoginController.isUserLoggedIn()}" />
+					<h:outputText id="ownProfileInvible" styleClass="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{userLoginController.isUserLoggedIn() and userLoginController.isInvisible()}" />
+
+					<ui:fragment rendered="#{userLoginController.isUserLoggedIn() and not userLoginController.isInvisible()}">
+						<h:outputText value="Bla bla" rendered="#{addressbookController.isOtherAddressbook()}" />
+					</ui:fragment>
+				</f:facet>
+			</h:panelGrid>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/user/show_addressbook_entries.xhtml b/web/guest/user/show_addressbook_entries.xhtml
similarity index 100%
rename from web/user/show_addressbook_entries.xhtml
rename to web/guest/user/show_addressbook_entries.xhtml
diff --git a/web/user/user_list.xhtml b/web/guest/user/user_list.xhtml
similarity index 100%
rename from web/user/user_list.xhtml
rename to web/guest/user/user_list.xhtml
diff --git a/web/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
similarity index 97%
rename from web/user/user_profile.xhtml
rename to web/guest/user/user_profile.xhtml
index b6936170..fe0a4efa 100644
--- a/web/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -1,48 +1,48 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
-
-	<f:metadata>
-		<f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
-			<f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-			<f:validator for="userId" validatorId="UserIdValidator" />
-		</f:viewParam>
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_PROFILE}</ui:define>
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_USER_PROFILE}
-		</ui:define>
-
-		<ui:define name="content">
-			<c:choose>
-				<c:when test="#{userController.isUserIdEmpty()}">
-					<ui:include src="/WEB-INF/templates/generic/userid_error.tpl" />
-				</c:when>
-
-				<c:when test="#{profileController.isProfileLinkVisibleById(userController.userId)}">
-					<div align="center">
-						<h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
-							<f:facet name="header">
-								#{msg.PUBLIC_USER_PROFILE}
-							</f:facet>
-						</h:panelGrid>
-					</div>
-				</c:when>
-
-				<c:otherwise>
-					#{msg.ERROR_PROFILE_NOT_VISIBLE}
-				</c:otherwise>
-			</c:choose>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+
+	<f:metadata>
+		<f:viewParam id="userId" name="userId" value="#{userController.userId}" required="true" requiredMessage="#{msg.PARAMETER_USER_ID_MISSING}" converterMessage="#{msg.PARAMETER_USER_ID_INVALID}" validatorMessage="#{msg.PARAMETER_USER_ID_NOT_FOUND}">
+			<f:convertNumber for="userId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
+			<f:validator for="userId" validatorId="UserIdValidator" />
+		</f:viewParam>
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_PROFILE}</ui:define>
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_USER_PROFILE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_INDEX_USER_PROFILE}
+		</ui:define>
+
+		<ui:define name="content">
+			<c:choose>
+				<c:when test="#{userController.isUserIdEmpty()}">
+					<ui:include src="/WEB-INF/templates/generic/userid_error.tpl" />
+				</c:when>
+
+				<c:when test="#{profileController.isProfileLinkVisibleById(userController.userId)}">
+					<div align="center">
+						<h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
+							<f:facet name="header">
+								#{msg.PUBLIC_USER_PROFILE}
+							</f:facet>
+						</h:panelGrid>
+					</div>
+				</c:when>
+
+				<c:otherwise>
+					#{msg.ERROR_PROFILE_NOT_VISIBLE}
+				</c:otherwise>
+			</c:choose>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/imprint.xhtml b/web/imprint.xhtml
index fea80343..25c8180f 100644
--- a/web/imprint.xhtml
+++ b/web/imprint.xhtml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
-
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_IMPRINT}
-		</ui:define>
-
-		<ui:define name="content">
-			TODO: Hier kommt das Impressum hin!
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_INDEX_IMPRINT}
+		</ui:define>
+
+		<ui:define name="content">
+			TODO: Hier kommt das Impressum hin!
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/privacy.xhtml b/web/privacy.xhtml
index 4d211283..86df2feb 100644
--- a/web/privacy.xhtml
+++ b/web/privacy.xhtml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
-
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_PRIVACY}
-		</ui:define>
-
-		<ui:define name="content">
-			Hier kommen die Datenschutzbestimmungen hin.
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_PRIVACY}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_INDEX_PRIVACY}
+		</ui:define>
+
+		<ui:define name="content">
+			Hier kommen die Datenschutzbestimmungen hin.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/terms.xhtml b/web/terms.xhtml
index a7a2ac9c..f46e4cf8 100644
--- a/web/terms.xhtml
+++ b/web/terms.xhtml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core"
-	>
-
-	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
-		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_INDEX_TERMS}
-		</ui:define>
-
-		<ui:define name="content">
-			Hier kommen die allgemeinen Geschäftsbedingungen hin.
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	>
+
+	<ui:composition template="/WEB-INF/templates/#{userLoginController.templateType}/#{userLoginController.templateType}_base.tpl">
+		<ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_TERMS}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_INDEX_TERMS}
+		</ui:define>
+
+		<ui:define name="content">
+			Hier kommen die allgemeinen Geschäftsbedingungen hin.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/login/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml
similarity index 97%
rename from web/login/login_add_addressbook.xhtml
rename to web/user/login_add_addressbook.xhtml
index f93fd7fd..a3d17464 100644
--- a/web/login/login_add_addressbook.xhtml
+++ b/web/user/login_add_addressbook.xhtml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  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_ADD_ADDRESSBOOK}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				<h:form id="add_addressbook" acceptcharset="utf-8">
-					<div class="table">
-						<div class="table_header">
-							#{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE}
-						</div>
-
-						<div class="table_row">
-							<div class="table_left">
-								<h:outputLabel for="addressbookName" value="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME}"/>
-							</div>
-
-							<div class="table_right">
-								<h:inputText styleClass="input" id="addressbookName" value="#{addressbookController.addressbookName}" maxlength="50" size="20" title="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME_TITLE}" required="true" requiredMessage="#{msg.LOGIN_ADDRESSBOOK_NAME_REQUIRED_MESSAGE}">
-									<f:validator for="addressbookName" validatorId="AddressbookNameValidator" />
-								</h:inputText>
-							</div>
-						</div>
-
-						<div class="table_footer">
-							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_LOGIN_ADD_ADDRESSBOOK}" action="#{addressbookController.addAddressbook()}" />
-						</div>
-					</div>
-				</h:form>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  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_ADD_ADDRESSBOOK}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_LOGIN_ADD_ADDRESSBOOK}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+				<h:form id="add_addressbook" acceptcharset="utf-8">
+					<div class="table">
+						<div class="table_header">
+							#{msg.FORM_LOGIN_ADD_ADDRESSBOOK_TITLE}
+						</div>
+
+						<div class="table_row">
+							<div class="table_left">
+								<h:outputLabel for="addressbookName" value="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME}"/>
+							</div>
+
+							<div class="table_right">
+								<h:inputText styleClass="input" id="addressbookName" value="#{addressbookController.addressbookName}" maxlength="50" size="20" title="#{msg.LOGIN_ENTER_ADDRESSBOOK_NAME_TITLE}" required="true" requiredMessage="#{msg.LOGIN_ADDRESSBOOK_NAME_REQUIRED_MESSAGE}">
+									<f:validator for="addressbookName" validatorId="AddressbookNameValidator" />
+								</h:inputText>
+							</div>
+						</div>
+
+						<div class="table_footer">
+							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+							<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_LOGIN_ADD_ADDRESSBOOK}" action="#{addressbookController.addAddressbook()}" />
+						</div>
+					</div>
+				</h:form>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/login/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
similarity index 100%
rename from web/login/login_change_email_address.xhtml
rename to web/user/login_change_email_address.xhtml
diff --git a/web/login/login_change_password.xhtml b/web/user/login_change_password.xhtml
similarity index 97%
rename from web/login/login_change_password.xhtml
rename to web/user/login_change_password.xhtml
index be8d7dbe..183c1b5d 100644
--- a/web/login/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  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_PASSWORD}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				<div class="table">
-					<div class="table_header">
-						#{msg.LOGIN_CHANGE_PASSWORD_TITLE}
-					</div>
-
-					<h:form id="login_form">
-						<div class="para">
-							<fieldset id="change_password">
-								<legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}</legend>
-
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
-									</div>
-
-									<div class="table_right">
-										<h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-
-								<div class="table_row">
-									<div class="table_left">
-										<h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />
-									</div>
-
-									<div class="table_right">
-										<h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
-									</div>
-
-									<div class="clear"></div>
-								</div>
-							</fieldset>
-						</div>
-
-						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
-
-						<div class="table_footer">
-							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
-						</div>
-					</h:form>
-				</div>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  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_PASSWORD}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_LOGIN_CHANGE_PASSWORD}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+				<div class="table">
+					<div class="table_header">
+						#{msg.LOGIN_CHANGE_PASSWORD_TITLE}
+					</div>
+
+					<h:form id="login_form">
+						<div class="para">
+							<fieldset id="change_password">
+								<legend title="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND_TITLE}">#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}</legend>
+
+								<div class="table_row">
+									<div class="table_left">
+										<h:outputLabel for="password1" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD1}" />
+									</div>
+
+									<div class="table_right">
+										<h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
+									</div>
+
+									<div class="clear"></div>
+								</div>
+
+								<div class="table_row">
+									<div class="table_left">
+										<h:outputLabel for="password2" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD2}" />
+									</div>
+
+									<div class="table_right">
+										<h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
+									</div>
+
+									<div class="clear"></div>
+								</div>
+							</fieldset>
+						</div>
+
+						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
+
+						<div class="table_footer">
+							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+							<h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
+						</div>
+					</h:form>
+				</div>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/login/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
similarity index 100%
rename from web/login/login_change_personal_data.xhtml
rename to web/user/login_change_personal_data.xhtml
diff --git a/web/login/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
similarity index 97%
rename from web/login/login_contact_data_saved.xhtml
rename to web/user/login_contact_data_saved.xhtml
index 8f52ddfe..b0414b3c 100644
--- a/web/login/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  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_CONTACT_DATA_SAVED}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				<ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-				</ui:include>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  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_CONTACT_DATA_SAVED}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_LOGIN_CONTACT_DATA_SAVED}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+				<ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+				</ui:include>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/login/login_data_saved.xhtml b/web/user/login_data_saved.xhtml
similarity index 97%
rename from web/login/login_data_saved.xhtml
rename to web/user/login_data_saved.xhtml
index 53ca4ea3..bd6b87e6 100644
--- a/web/login/login_data_saved.xhtml
+++ b/web/user/login_data_saved.xhtml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  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_DATA_SAVED}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				<ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-				</ui:include>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  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_DATA_SAVED}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_LOGIN_DATA_SAVED}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+				<ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+				</ui:include>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/login/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
similarity index 97%
rename from web/login/login_edit_user_data.xhtml
rename to web/user/login_edit_user_data.xhtml
index 661befae..261571cb 100644
--- a/web/login/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  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_EDIT_USER_DATA}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				<div class="table">
-					<div class="table_header">
-						#{msg.LOGIN_EDIT_USER_DATA_TITLE}
-					</div>
-
-					<div class="para notice">
-						<h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
-					</div>
-
-					<div class="para">
-						<ul>
-							<li>
-								<h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
-							</li>
-							<li>
-								<h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />
-							</li>
-							<li>
-								<h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
-							</li>
-						</ul>
-					</div>
-				</div>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  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_EDIT_USER_DATA}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_LOGIN_EDIT_USER_DATA}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+				<div class="table">
+					<div class="table_header">
+						#{msg.LOGIN_EDIT_USER_DATA_TITLE}
+					</div>
+
+					<div class="para notice">
+						<h:outputText value="#{msg.LOGIN_CHOOSE_PERSONAL_DATA_EMAIL_PASSWORD_NOTICE}" />
+					</div>
+
+					<div class="para">
+						<ul>
+							<li>
+								<h:link title="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA_TITLE}" outcome="login_change_personal_data" value="#{msg.LINK_LOGIN_CHANGE_PERSONAL_DATA}" />
+							</li>
+							<li>
+								<h:link title="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" outcome="login_change_email_address" value="#{msg.LINK_LOGIN_CHANGE_EMAIL_ADDRESS}" />
+							</li>
+							<li>
+								<h:link title="#{msg.LINK_LOGIN_CHANGE_PASSWORD_TITLE}" outcome="login_change_password" value="#{msg.LINK_LOGIN_CHANGE_PASSWORD}" />
+							</li>
+						</ul>
+					</div>
+				</div>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/login/login_index.xhtml b/web/user/login_index.xhtml
similarity index 97%
rename from web/login/login_index.xhtml
rename to web/user/login_index.xhtml
index d0c5d23e..92d6b8f7 100644
--- a/web/login/login_index.xhtml
+++ b/web/user/login_index.xhtml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  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_HOME}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_HOME}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				Here goes your content.
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  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_HOME}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_LOGIN_HOME}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+				Here goes your content.
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/login/login_own_addressbooks.xhtml b/web/user/login_own_addressbooks.xhtml
similarity index 98%
rename from web/login/login_own_addressbooks.xhtml
rename to web/user/login_own_addressbooks.xhtml
index e8b26389..235cb072 100644
--- a/web/login/login_own_addressbooks.xhtml
+++ b/web/user/login_own_addressbooks.xhtml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  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_OWN_ADDRESSBOOKS}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:outputText rendered="#{userLoginController.isUserLoggedIn()}">
-				<div class="table">
-					<div class="table_header">
-						#{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}
-					</div>
-
-					<div class="para">
-						<h:dataTable id="table_own_addressbooks" var="addressbook" value="#{addressbookController.allAddressbooks()}" styleClass="table" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS}" rendered="#{addressbookController.hasCreatedAddressbooks()}">
-							<h:column>
-								<f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
-
-								<h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">
-									<f:param name="addressbookId" value="#{addressbook.addressbookId}" />
-									<h:outputText id="addressbookName" value="#{addressbook.addressbookName}" title="#{msg.ADDRESSBOOK_NAME_TITLE}" />
-								</h:link>
-							</h:column>
-
-							<h:column>
-								<f:facet name="header">#{msg.ADDRESSBOOK_TOTAL_ENTRIES}</f:facet>
-
-								<h:link outcome="show_addressbook_entries" title="#{msg.LINK_SHOW_ADDRESSBOOK_ENTRIES_TITLE}">
-									<f:param name="addressbookId" value="#{addressbook.addressbookId}" />
-									<h:outputText id="addressbookEntries" value="#{addressbookController.allEntriesSize(addressbook)}" title="#{msg.ADDRESSBOOK_TOTAL_ENTRIES_TITLE}" />
-								</h:link>
-							</h:column>
-
-							<h:column>
-								<f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>
-
-								<h:outputFormat id="addressbookCreated" value="#{addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
-									<f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
-								</h:outputFormat>
-							</h:column>
-						</h:dataTable>
-					</div>
-
-					<div class="table_footer">
-						<h:link id="add_first_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks() == false}" />
-						<h:link id="add_additional_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks()}" />
-					</div>
-				</div>
-			</h:outputText>
-
-			<h:outputText rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</h:outputText>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  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_OWN_ADDRESSBOOKS}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:outputText rendered="#{userLoginController.isUserLoggedIn()}">
+				<div class="table">
+					<div class="table_header">
+						#{msg.TABLE_HEADER_LIST_OWN_ADDRESSBOOKS}
+					</div>
+
+					<div class="para">
+						<h:dataTable id="table_own_addressbooks" var="addressbook" value="#{addressbookController.allAddressbooks()}" styleClass="table" headerClass="table_data_column" summary="#{msg.TABLE_SUMMARY_LOGIN_LIST_OWN_ADDRESSBOOKS}" rendered="#{addressbookController.hasCreatedAddressbooks()}">
+							<h:column>
+								<f:facet name="header">#{msg.ADDRESSBOOK_NAME}</f:facet>
+
+								<h:link outcome="user_show_addressbook" title="#{msg.LINK_SHOW_ADDRESSBOOK_TITLE}">
+									<f:param name="addressbookId" value="#{addressbook.addressbookId}" />
+									<h:outputText id="addressbookName" value="#{addressbook.addressbookName}" title="#{msg.ADDRESSBOOK_NAME_TITLE}" />
+								</h:link>
+							</h:column>
+
+							<h:column>
+								<f:facet name="header">#{msg.ADDRESSBOOK_TOTAL_ENTRIES}</f:facet>
+
+								<h:link outcome="show_addressbook_entries" title="#{msg.LINK_SHOW_ADDRESSBOOK_ENTRIES_TITLE}">
+									<f:param name="addressbookId" value="#{addressbook.addressbookId}" />
+									<h:outputText id="addressbookEntries" value="#{addressbookController.allEntriesSize(addressbook)}" title="#{msg.ADDRESSBOOK_TOTAL_ENTRIES_TITLE}" />
+								</h:link>
+							</h:column>
+
+							<h:column>
+								<f:facet name="header">#{msg.ADDRESSBOOK_CREATED}</f:facet>
+
+								<h:outputFormat id="addressbookCreated" value="#{addressbook.addressbookCreated.time}" title="#{msg.ADDRESSBOOK_CREATED_TITLE}">
+									<f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
+								</h:outputFormat>
+							</h:column>
+						</h:dataTable>
+					</div>
+
+					<div class="table_footer">
+						<h:link id="add_first_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_FIRST_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks() == false}" />
+						<h:link id="add_additional_addressbook" outcome="login_add_addressbook" value="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_ADD_ADDITIONAL_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.hasCreatedAddressbooks()}" />
+					</div>
+				</div>
+			</h:outputText>
+
+			<h:outputText rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			</h:outputText>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/login/login_user_data_saved.xhtml b/web/user/login_user_data_saved.xhtml
similarity index 97%
rename from web/login/login_user_data_saved.xhtml
rename to web/user/login_user_data_saved.xhtml
index da199456..a98fbcbe 100644
--- a/web/login/login_user_data_saved.xhtml
+++ b/web/user/login_user_data_saved.xhtml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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}"
-	xmlns="http://www.w3.org/1999/xhtml"
-	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  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_USER_DATA_SAVED}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
-				<ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
-					<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
-				</ui:include>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
-				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
-			</ui:fragment>
-		</ui:define>
-	</ui:composition>
-</html>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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}"
+	xmlns="http://www.w3.org/1999/xhtml"
+	  xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  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_USER_DATA_SAVED}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_LOGIN_USER_DATA_SAVED}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+				<ui:include id="message_box" src="/WEB-INF/templates/generic/message_box.tpl">
+					<ui:param name="message" value="#{msg.LOGIN_MESSAGE_DATA_SAVED}" />
+				</ui:include>
+			</ui:fragment>
+
+			<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+				<ui:include id="login_only" src="/WEB-INF/templates/generic/user_not_logged_in.tpl" />
+			</ui:fragment>
+		</ui:define>
+	</ui:composition>
+</html>
-- 
2.39.5