From: Roland Häder <roland@mxchange.org>
Date: Wed, 4 May 2016 10:58:03 +0000 (+0200)
Subject: class was wrong, needs to be styleClass
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e96be6b90944d45af1b8746530f49d2790841fe9;p=jfinancials-war.git

class was wrong, needs to be styleClass

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

diff --git a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java
index 9a379e7d..0c8956d0 100644
--- a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionBean.java
@@ -26,13 +26,13 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
 import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jusercore.exceptions.UserPasswordMismatchException;
 import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress;
 import org.mxchange.jusercore.model.email_address.EmailAddressChange;
 import org.mxchange.jusercore.model.email_address.EmailChangeSessionBeanRemote;
 import org.mxchange.jusercore.model.user.User;
-import org.mxchange.addressbook.beans.login.AddressbookUserLoginWebSessionController;
 
 /**
  * A web session bean for changing email addresses
@@ -51,12 +51,12 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
 	/**
 	 * Email address 1 (changing)
 	 */
-	private String emailAddress1;
+	private String emailAddress;
 
 	/**
 	 * Email address 2 (repeat in changing)
 	 */
-	private String emailAddress2;
+	private String emailAddressRepeat;
 
 	/**
 	 * Local list of already queued email addresses
@@ -103,7 +103,7 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
 		} else if (!this.isRequiredChangeEmailAddressSet()) {
 			// Not all required fields are set
 			throw new FaceletException("Not all required fields are set."); //NOI18N
-		} else if (!Objects.equals(this.getEmailAddress1(), this.getEmailAddress2())) {
+		} else if (!Objects.equals(this.getEmailAddress(), this.getEmailAddressRepeat())) {
 			// Email address 1+2 mismatch
 			throw new FaceletException("Email address 1/2 are mismatching."); //NOI18N
 		} else if (!this.loginController.ifCurrentPasswordMatches()) {
@@ -123,7 +123,7 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
 		assert (user.getUserContact().getContactId() > 0) : MessageFormat.format("Instance loginController.userContact.contactId={0} is invalid", user.getUserContact().getContactId()); //NOI18N
 
 		// Get dummy email address
-		String dummyEmail = this.getEmailAddress1();
+		String dummyEmail = this.getEmailAddress();
 
 		// Unset all so the user is forced to re-enter it
 		this.clear();
@@ -145,29 +145,29 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
 	}
 
 	@Override
-	public String getEmailAddress1 () {
-		return this.emailAddress1;
+	public String getEmailAddress () {
+		return this.emailAddress;
 	}
 
 	@Override
-	public void setEmailAddress1 (final String emailAddress1) {
-		this.emailAddress1 = emailAddress1;
+	public void setEmailAddress (final String emailAddress) {
+		this.emailAddress = emailAddress;
 	}
 
 	@Override
-	public String getEmailAddress2 () {
-		return this.emailAddress2;
+	public String getEmailAddressRepeat () {
+		return this.emailAddressRepeat;
 	}
 
 	@Override
-	public void setEmailAddress2 (final String emailAddress2) {
-		this.emailAddress2 = emailAddress2;
+	public void setEmailAddressRepeat (final String emailAddressRepeat) {
+		this.emailAddressRepeat = emailAddressRepeat;
 	}
 
 	@Override
 	public boolean isRequiredChangeEmailAddressSet () {
-		return ((this.getEmailAddress1() != null) &&
-				(this.getEmailAddress2() != null));
+		return ((this.getEmailAddress() != null) &&
+				(this.getEmailAddressRepeat() != null));
 	}
 
 	/**
@@ -175,8 +175,8 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
 	 */
 	private void clear () {
 		// Clear fields
-		this.setEmailAddress1(null);
-		this.setEmailAddress2(null);
+		this.setEmailAddress(null);
+		this.setEmailAddressRepeat(null);
 	}
 
 	/**
@@ -186,7 +186,7 @@ public class AddressbookEmailChangeWebSessionBean implements AddressbookEmailCha
 	 * <p>
 	 * @param emailAddress Email address to verify
 	 * <p>
-	 * @return Whether the email address in field emailAddress1 is already queued
+	 * @return Whether the email address in field emailAddress is already queued
 	 */
 	private boolean isEmailAddressQueued (final String emailAddress) {
 		// It should be there
diff --git a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionController.java b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionController.java
index 1d939fd0..373235a7 100644
--- a/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionController.java
+++ b/src/java/org/mxchange/addressbook/beans/email_address/AddressbookEmailChangeWebSessionController.java
@@ -30,28 +30,28 @@ public interface AddressbookEmailChangeWebSessionController extends Serializable
 	 * <p>
 	 * @return Email address
 	 */
-	String getEmailAddress1 ();
+	String getEmailAddress ();
 
 	/**
 	 * Setter for email address 1 (changing)
 	 * <p>
-	 * @param emailAddress1 Email address 1
+	 * @param emailAddress Email address 1
 	 */
-	void setEmailAddress1 (final String emailAddress1);
+	void setEmailAddress (final String emailAddress);
 
 	/**
 	 * Getter for email address 2 (repeat changing)
 	 * <p>
 	 * @return Email address 2
 	 */
-	String getEmailAddress2 ();
+	String getEmailAddressRepeat ();
 
 	/**
 	 * Setter for email address 2 (repeat changing)
 	 * <p>
-	 * @param emailAddress2 Email address 2
+	 * @param emailAddressRepeat Email address 2
 	 */
-	void setEmailAddress2 (final String emailAddress2);
+	void setEmailAddressRepeat (final String emailAddressRepeat);
 
 	/**
 	 * Checks whether all required are set for changing email address
diff --git a/web/WEB-INF/templates.dist/login_page.xhtml b/web/WEB-INF/templates.dist/login_page.xhtml
index a0b74076..ef04e61b 100644
--- a/web/WEB-INF/templates.dist/login_page.xhtml
+++ b/web/WEB-INF/templates.dist/login_page.xhtml
@@ -11,7 +11,7 @@
 		<ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_FOO}</ui:define>
 
 		<ui:define name="menu">
-			<ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+			<ui:include id="menu" src="/WEB-INF/templates/login/login_menu.tpl" />
 		</ui:define>
 
 		<ui:define name="content_header">
@@ -23,7 +23,7 @@
 		</ui:define>
 
 		<ui:define name="footer">
-			<ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
+			<ui:include id="footer" src="/WEB-INF/templates/login/login_footer.tpl" />
 		</ui:define>
 	</ui:composition>
 </html>
diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl
index bd06406a..4ad01e36 100644
--- a/web/WEB-INF/templates/admin/admin_base.tpl
+++ b/web/WEB-INF/templates/admin/admin_base.tpl
@@ -3,17 +3,17 @@
 	xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<ui:define name="title">Administration - <ui:insert name="admin_title" class="admin_title" /></ui:define>
+	<ui:define name="title">Administration - <ui:insert name="admin_title">Default admin title</ui:insert></ui:define>
 
 	<!--
 	TODO: Add something here that should be displayed on all admin pages
 	//-->
 
 	<ui:define name="menu">
-		<ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
+		<ui:include id="menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
 	</ui:define>
 
 	<ui:define name="footer">
-		<ui:include id="footer" class="admin_footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
+		<ui:include id="footer" src="/WEB-INF/templates/admin/admin_footer.tpl" />
 	</ui:define>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index b1c484b1..04aeab14 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -29,9 +29,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" required="true">
-						<f:validator for="firstName" validatorId="NameValidator" />
-					</h:inputText>
+					<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
 				</div>
 
 				<div class="clear"></div>
@@ -43,9 +41,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" required="true">
-						<f:validator for="familyName" validatorId="NameValidator" />
-					</h:inputText>
+					<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
 				</div>
 
 				<div class="clear"></div>
@@ -57,7 +53,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
+					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
 				</div>
 
 				<div class="clear"></div>
@@ -69,7 +65,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+					<h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
 						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
 					</h:inputText>
 				</div>
@@ -83,7 +79,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+					<h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
 					</h:inputText>
 				</div>
@@ -97,7 +93,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
+					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
 				</div>
 
 				<div class="clear"></div>
@@ -109,7 +105,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
+					<h:selectOneMenu  styleClass="select" id="country" value="#{adminContactController.country}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
@@ -124,16 +120,16 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{adminContactController.phoneCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{adminContactController.phoneAreaCode}">
+					<h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{adminContactController.phoneAreaCode}">
 						<f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
-					<h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{adminContactController.phoneNumber}">
+					<h:inputText styleClass="input" id="phoneNumber" size="10" maxlength="20" value="#{adminContactController.phoneNumber}">
 						<f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
@@ -147,16 +143,16 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{adminContactController.faxCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
+					<h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
-					<h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
+					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{adminContactController.faxNumber}">
 						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
@@ -177,6 +173,18 @@
 
 				<div class="clear"></div>
 			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
 		</fieldset>
 	</div>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
index c77f8b6e..4700255e 100644
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -19,7 +19,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText class="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true">
+					<h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true">
 						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
 					</h:inputText>
 				</div>
@@ -33,11 +33,11 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText class="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
+					<h:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
 						<f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
 					</h:inputText>
 
-					<h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
+					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
 				</div>
 
 				<div class="clear"></div>
@@ -49,7 +49,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText class="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
+					<h:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
 						<f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
 					</h:inputText>
 				</div>
@@ -63,7 +63,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneListbox required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1" class="select">
+					<h:selectOneListbox styleClass="select" required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1">
 						<f:selectItem itemValue="true" itemLabel="#{msg.CHOICE_YES}" />
 						<f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
 					</h:selectOneListbox>
@@ -78,7 +78,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText class="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true">
+					<h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true">
 						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
 					</h:inputText>
 				</div>
@@ -92,11 +92,11 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText class="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true">
+					<h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true">
 						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
 					</h:inputText>
 
-					<h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
+					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
 				</div>
 
 				<div class="clear"></div>
diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index bef9b00a..9bbaf3d1 100644
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -19,7 +19,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText class="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
+					<h:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
 						<f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
 					</h:inputText>
 				</div>
@@ -33,9 +33,9 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText class="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
+					<h:inputText styleClass="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
 
-					<h:outputText class="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
+					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
 				</div>
 
 				<div class="clear"></div>
@@ -47,7 +47,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:inputText class="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
+					<h:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
 				</div>
 
 				<div class="clear"></div>
@@ -59,7 +59,7 @@
 				</div>
 
 				<div class="table_right_medium">
-					<h:selectOneMenu class="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="CountryConverter">
 						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
 				</div>
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index 08f223d9..8ff1740d 100644
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -18,7 +18,7 @@
 					</div>
 
 					<div class="table_right">
-						<h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+						<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
 					</div>
 
 					<div class="clear"></div>
@@ -33,7 +33,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
+							<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{adminContactController.emailAddress}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -48,7 +48,7 @@
 					</div>
 
 					<div class="table_right">
-						<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
+						<h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
 					</div>
 
 					<div class="clear"></div>
@@ -60,7 +60,7 @@
 					</div>
 
 					<div class="table_right">
-						<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
+						<h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
 					</div>
 
 					<div class="clear"></div>
@@ -71,7 +71,7 @@
 						<li>#{msg.ADMIN_USER_DATA_USER_NAME_NOTICE}</li>
 
 						<li>
-							<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
+							<h:outputText value="#{msg.ADMIN_DATA_PASSWORD_EDIT_NOTICE}" rendered="#{mode == 'edit'}" />
 							<h:outputText value="#{msg.ADMIN_USER_DATA_PASSWORD_ADD_NOTICE}" rendered="#{mode == 'add'}" />
 						</li>
 
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
new file mode 100644
index 00000000..30065fd4
--- /dev/null
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<div class="para notice">
+		#{msg.PERSONAL_DATA_MINIMUM_NOTICE}
+	</div>
+
+	<div class="para">
+		<fieldset id="personal_data">
+			<legend title="#{msg.PERSONAL_DATA_LEGEND_TITLE}">#{msg.PERSONAL_DATA_LEGEND}</legend>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="gender" value="#{msg.PERSONAL_DATA_GENDER}" />
+				</div>
+
+				<div class="table_right">
+					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+						<ui:param  name="targetController" value="#{contactController}" />
+					</ui:include>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true">
+						<f:validator for="firstName" validatorId="NameValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true">
+						<f:validator for="familyName" validatorId="NameValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true">
+						<f:validator for="street" validatorId="NameValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true">
+						<f:validator for="city" validatorId="NameValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
+				</div>
+
+				<div class="table_right">
+					<h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}" converter="CountryConverter">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
+					</h:selectOneMenu>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
+				</div>
+
+				<div class="table_right">
+					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="CountryConverter">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
+						<f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText styleClass="input" id="phoneNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
+						<f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
+				</div>
+
+				<div class="table_right">
+					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="CountryConverter">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="cellphoneNumber" value="#{msg.PERSONAL_DATA_CELLPHONE_NUMBER}" />
+				</div>
+
+				<div class="table_right">
+					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+						<ui:param name="targetController" value="#{contactController}" />
+					</ui:include>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+		</fieldset>
+	</div>
+
+	<div class="para">
+		<fieldset id="user_profile">
+			<legend title="#{msg.USER_PROFILE_LEGEND_TITLE}">#{msg.USER_PROFILE_LEGEND}</legend>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="profileMode" value="#{msg.USER_PROFILE_MODE}" />
+				</div>
+
+				<div class="table_right">
+					<ui:include src="/WEB-INF/templates/generic/profile_mode_selection_box.tpl" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="para notice">
+					<ul>
+						<li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE1}</li>
+						<li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE2}</li>
+						<li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE3}</li>
+					</ul>
+				</div>
+			</div>
+		</fieldset>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/generic/form_personal_data.tpl b/web/WEB-INF/templates/generic/form_personal_data.tpl
index a39b1a92..30065fd4 100644
--- a/web/WEB-INF/templates/generic/form_personal_data.tpl
+++ b/web/WEB-INF/templates/generic/form_personal_data.tpl
@@ -33,7 +33,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true">
+					<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true">
 						<f:validator for="firstName" validatorId="NameValidator" />
 					</h:inputText>
 				</div>
@@ -47,7 +47,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true">
+					<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true">
 						<f:validator for="familyName" validatorId="NameValidator" />
 					</h:inputText>
 				</div>
@@ -61,7 +61,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true">
+					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true">
 						<f:validator for="street" validatorId="NameValidator" />
 					</h:inputText>
 				</div>
@@ -75,7 +75,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+					<h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
 						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
 					</h:inputText>
 				</div>
@@ -89,7 +89,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+					<h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
 					</h:inputText>
 				</div>
@@ -103,7 +103,7 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputText class="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true">
+					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true">
 						<f:validator for="city" validatorId="NameValidator" />
 					</h:inputText>
 				</div>
@@ -117,9 +117,9 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="country" value="#{contactController.country}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
 					</h:selectOneMenu>
 				</div>
 
@@ -132,16 +132,16 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="countryPhoneCode" value="#{contactController.phoneCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
+					<h:inputText styleClass="input" id="phoneAreaCode" size="5" maxlength="10" value="#{contactController.phoneAreaCode}">
 						<f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
-					<h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
+					<h:inputText styleClass="input" id="phoneNumber" size="10" maxlength="20" value="#{contactController.phoneNumber}">
 						<f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
@@ -155,16 +155,16 @@
 				</div>
 
 				<div class="table_right">
-					<h:selectOneMenu class="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="CountryConverter">
+					<h:selectOneMenu styleClass="select" id="faxCountryCode" value="#{contactController.faxCountry}" converter="CountryConverter">
 						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{country.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+					<h:inputText styleClass="input" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
-					<h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
+					<h:inputText styleClass="input" id="faxNumber" size="10" maxlength="20" value="#{contactController.faxNumber}">
 						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 				</div>
@@ -207,9 +207,9 @@
 			<div class="table_row">
 				<div class="para notice">
 					<ul>
-						<li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}</li>
-						<li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_MEMBERS}</li>
-						<li>#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_PUBLIC}</li>
+						<li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE1}</li>
+						<li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE2}</li>
+						<li>#{msg.USER_PROFILE_MODE_SELECTION_NOTICE3}</li>
 					</ul>
 				</div>
 			</div>
diff --git a/web/WEB-INF/templates/generic/gender_selection_box.tpl b/web/WEB-INF/templates/generic/gender_selection_box.tpl
index b439e935..4a5919f1 100644
--- a/web/WEB-INF/templates/generic/gender_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/gender_selection_box.tpl
@@ -6,7 +6,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu class="select" id="gender" value="#{targetController.gender}">
+		<h:selectOneMenu styleClass="select" id="gender" value="#{targetController.gender}">
 			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 			<f:selectItems value="#{genderController.selectableGenders}" var="g" itemValue="#{g}" itemLabel="#{msg[g.messageKey]}" />
 		</h:selectOneMenu>
diff --git a/web/WEB-INF/templates/generic/mobile_selection_box.tpl b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
index 55ea9e3f..14515170 100644
--- a/web/WEB-INF/templates/generic/mobile_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/mobile_selection_box.tpl
@@ -6,12 +6,12 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu class="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">
+		<h:selectOneMenu styleClass="select" id="cellphoneCarrier" value="#{targetController.cellphoneCarrier}" converter="MobileProviderConverter">
 			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 			<f:selectItems value="#{mobileController.allMobileProvider()}" var="p" itemValue="#{p}" itemLabel="#{p.providerCountry.countryExternalDialPrefix}#{p.providerDialPrefix} (#{p.providerName})" />
 		</h:selectOneMenu>
 
-		<h:inputText class="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">
+		<h:inputText styleClass="input" id="cellphoneNumber" size="10" maxlength="20" value="#{targetController.cellphoneNumber}">
 			<f:validator for="cellphoneNumber" validatorId="PhoneNumberValidator" />
 		</h:inputText>
 	</ui:fragment>
diff --git a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl b/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl
index 5b59fb43..30799916 100644
--- a/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl
+++ b/web/WEB-INF/templates/generic/profile_mode_selection_box.tpl
@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:selectOneMenu class="select" id="profileMode" value="#{userController.userProfileMode}">
-		<f:selectItems value="#{profileMode.allProfileModes}" var="m" itemValue="#{m}" itemLabel="#{msg[m.messageKey]}" />
+	<h:selectOneMenu styleClass="select" id="profileMode" value="#{userController.userProfileMode}">
+		<f:selectItems value="#{profileModeController.allProfileModes}" var="m" itemValue="#{m}" itemLabel="#{msg[m.messageKey]}" />
 	</h:selectOneMenu>
 </ui:composition>
diff --git a/web/WEB-INF/templates/generic/user_profile_link.tpl b/web/WEB-INF/templates/generic/user_profile_link.tpl
index 26fe3516..6188f9c1 100644
--- a/web/WEB-INF/templates/generic/user_profile_link.tpl
+++ b/web/WEB-INF/templates/generic/user_profile_link.tpl
@@ -7,7 +7,7 @@
 
 	<h:outputText styleClass="notice" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty user}" />
 
-	<h:outputText class="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
+	<h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
 	<h:link id="userProfileLink" outcome="user_profile" title="#{msg.LINK_USER_PROFILE_TITLE}" rendered="#{not empty user and profileController.isProfileLinkVisibleByUser(user)}">
 		<h:outputText id="userName" value="#{user.userName}" />
diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl
index 5b18b854..4b2e0aa9 100644
--- a/web/WEB-INF/templates/guest/guest_base.tpl
+++ b/web/WEB-INF/templates/guest/guest_base.tpl
@@ -5,14 +5,14 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<ui:define name="title">
-		<ui:insert name="guest_title" class="guest_title" />
+		<ui:insert name="guest_title">Default guest title</ui:insert>
 	</ui:define>
 
 	<ui:define name="menu">
-		<ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
+		<ui:include id="menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
 	</ui:define>
 
 	<ui:define name="footer">
-		<ui:include id="footer" class="guest_footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
+		<ui:include id="footer" src="/WEB-INF/templates/guest/guest_footer.tpl" />
 	</ui:define>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/guest_login_form.tpl
index f6384692..03ca598f 100644
--- a/web/WEB-INF/templates/guest/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_login_form.tpl
@@ -4,6 +4,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
 	<div id="user_login_content">
 		<h:form id="login_form">
 			<div class="table">
@@ -20,7 +21,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputText class="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
+							<h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
 						</div>
 					</div>
 
@@ -32,7 +33,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret class="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
+							<h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
 						</div>
 					</div>
 
@@ -40,8 +41,8 @@
 				</fieldset>
 
 				<div class="table_footer">
-					<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton class="submit" type="submit" action="#{loginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
+					<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
 				</div>
 			</div>
 		</h:form>
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index d49b5643..e4b3f398 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -11,7 +11,7 @@
 
 			<div class="table_row">
 				<div class="table_left25">
-					<h:selectBooleanCheckbox class="input" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
+					<h:selectBooleanCheckbox styleClass="input" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
 						<f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
 					</h:selectBooleanCheckbox>
 				</div>
@@ -27,7 +27,7 @@
 
 			<div class="table_row">
 				<div class="table_left25">
-					<h:selectBooleanCheckbox class="input" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
+					<h:selectBooleanCheckbox styleClass="input" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
 						<f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
 					</h:selectBooleanCheckbox>
 				</div>
diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
index fe5758e6..73e5c5a0 100644
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl
@@ -24,7 +24,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputText class="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
+							<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -36,7 +36,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{userController.emailAddress}" required="true" />
+							<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -48,7 +48,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{userController.emailAddressRepeat}" required="true" />
+							<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -62,7 +62,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
+							<h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userController.userPassword}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -74,7 +74,7 @@
 						</div>
 
 						<div class="table_right">
-							<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
+							<h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="true" />
 						</div>
 
 						<div class="clear"></div>
@@ -89,8 +89,8 @@
 			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
 			<div class="table_footer">
-				<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-				<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doRegister()}" />
+				<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{registerController.doRegister()}" />
 			</div>
 		</div>
 	</h:form>
diff --git a/web/WEB-INF/templates/login/login_base.tpl b/web/WEB-INF/templates/login/login_base.tpl
index dafc7786..7af8e037 100644
--- a/web/WEB-INF/templates/login/login_base.tpl
+++ b/web/WEB-INF/templates/login/login_base.tpl
@@ -5,18 +5,18 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
 	xmlns:h="http://xmlns.jcp.org/jsf/html">
 
-	<ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title" class="login_title" /></ui:define>
+	<ui:define name="title">#{msg.PAGE_TITLE_LOGIN_AREA} - <ui:insert name="login_title">Default login title</ui:insert></ui:define>
 
 	<ui:define name="menu">
-		<ui:fragment rendered="#{loginController.isUserLoggedIn()}">
-			<ui:include id="menu" class="login_menu" src="/WEB-INF/templates/login/login_menu.tpl" />
+		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
+			<ui:include id="menu" src="/WEB-INF/templates/login/login_menu.tpl" />
 		</ui:fragment>
-		<ui:fragment rendered="#{not loginController.isUserLoggedIn()}">
-			<h:outputText class="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
+		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
+			<h:outputText styleClass="errors" value="#{msg.USER_NOT_LOGGED_IN}" />
 		</ui:fragment>
 	</ui:define>
 
 	<ui:define name="footer">
-		<ui:include id="footer" class="login_footer" src="/WEB-INF/templates/login/login_footer.tpl" />
+		<ui:include id="footer" src="/WEB-INF/templates/login/login_footer.tpl" />
 	</ui:define>
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/login_enter_current_password.tpl b/web/WEB-INF/templates/login/login_enter_current_password.tpl
index 9f32eb9b..9a732b38 100644
--- a/web/WEB-INF/templates/login/login_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/login_enter_current_password.tpl
@@ -14,9 +14,9 @@
 				</div>
 
 				<div class="table_right">
-					<h:inputSecret class="input" id="currentPassword" size="10" maxlength="255" value="#{loginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
-						<h:message for="currentPassword" class="errors" />
-						<!-- <f:validator for="currentPassword" validatorId="AddressbookUserPasswordValidator" /> //-->
+					<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.currentPassword}" required="true" validatorMessage="#{msg.ERROR_CURRENT_PASSWORD_MISMATCHING}">
+						<h:message for="currentPassword" styleClass="errors" />
+						<!-- <f:validator for="currentPassword" validatorId="RecruiterUserPasswordValidator" /> //-->
 					</h:inputSecret>
 				</div>
 
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index 5ca8b083..badc92e3 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -38,8 +38,8 @@
 					<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data.tpl" />
 
 					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="delete_button" type="submit" id="register" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
+						<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>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index 11928a3e..0ac502ad 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -40,8 +40,8 @@
 					</ui:include>
 
 					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
+						<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>
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index dca2708a..1c2b214f 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -71,8 +71,8 @@
 					<ui:include src="/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl" />
 
 					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
+						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
 					</div>
 				</h:form>
 			</div>
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 61a6c937..63cda07c 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -53,8 +53,8 @@
 					<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
 					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
+						<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>
 
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 5bb205a0..9d03373c 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -61,8 +61,8 @@
 					<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
 
 					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
+						<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>
 
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index 9c0ca9a9..1578ec17 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -10,6 +10,7 @@
 
 	<f:metadata>
 		<f:viewParam name="userId" value="#{adminHelper.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+		<f:viewAction action="#{adminHelper.copyUserToController()}" />
 	</f:metadata>
 
 	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
@@ -29,7 +30,7 @@
 					</div>
 
 					<div class="para notice">
-						#{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
+						#{msg.ADMIN_USER_PERSONAL_DATA_MINIMUM_NOTICE}
 					</div>
 
 					<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_data.tpl">
@@ -37,8 +38,8 @@
 					</ui:include>
 
 					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
+						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
 					</div>
 				</div>
 			</h:form>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index bbed8b88..3588c9c3 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -86,7 +86,7 @@
 								</div>
 
 								<div class="table_right_medium">
-									<h:selectOneMenu class="select" id="userContact" value="#{adminHelper.contact}" converter="ContactConverter">
+									<h:selectOneMenu styleClass="select" id="userContact" value="#{adminHelper.contact}" converter="ContactConverter">
 										<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
 										<f:selectItems value="#{adminUserController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactGender.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
 									</h:selectOneMenu>
@@ -104,8 +104,8 @@
 					<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
 
 					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
+						<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton styleClass="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
 					</div>
 				</h:form>
 			</div>
diff --git a/web/guest/user/login.xhtml b/web/guest/user/login.xhtml
index 0b0efb62..7c873975 100644
--- a/web/guest/user/login.xhtml
+++ b/web/guest/user/login.xhtml
@@ -22,7 +22,7 @@
 			</div>
 
 			<div class="para">
-				<ui:include id="login_form" class="login_form" src="/WEB-INF/templates/guest/guest_login_form.tpl" />
+				<ui:include id="login_form" src="/WEB-INF/templates/guest/guest_login_form.tpl" />
 			</div>
 
 			<div class="para">
diff --git a/web/guest/user/lost_passwd.xhtml b/web/guest/user/lost_passwd.xhtml
index c6c0848c..103e070c 100644
--- a/web/guest/user/lost_passwd.xhtml
+++ b/web/guest/user/lost_passwd.xhtml
@@ -32,7 +32,7 @@
 								</div>
 
 								<div class="table_right">
-									<h:inputText class="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
+									<h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
 								</div>
 
 								<div class="clear"></div>
@@ -48,7 +48,7 @@
 								</div>
 
 								<div class="table_right">
-									<h:inputText class="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
+									<h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
 								</div>
 
 								<div class="clear"></div>
@@ -57,8 +57,8 @@
 						</fieldset>
 
 						<div class="table_footer">
-							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
+							<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>
diff --git a/web/guest/user/register_done.xhtml b/web/guest/user/register_done.xhtml
index bbec38e6..ddffa7e7 100644
--- a/web/guest/user/register_done.xhtml
+++ b/web/guest/user/register_done.xhtml
@@ -21,7 +21,7 @@
 			</div>
 
 			<div class="registration_form">
-				<h:link id="resend_link" class="resend_link" value="#{msg.LINK_GUEST_RESENT_CONFIRMATION_LINK}" outcome="user_resend_link">
+				<h:link id="resend_link" styleClass="resend_link" value="#{msg.LINK_GUEST_RESENT_CONFIRMATION_LINK}" outcome="user_resend_link">
 					<f:param name="user_id" value="#{userController.userId}" />
 				</h:link>
 			</div>
diff --git a/web/guest/user/show_addressbook.xhtml b/web/guest/user/show_addressbook.xhtml
index 1a1193fc..6095ec33 100644
--- a/web/guest/user/show_addressbook.xhtml
+++ b/web/guest/user/show_addressbook.xhtml
@@ -14,7 +14,7 @@
 		</f:viewParam>
 	</f:metadata>
 
-	<ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
+	<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>
 
@@ -26,29 +26,27 @@
 			<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" class="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
+				<h:outputLabel for="addressbookName" styleClass="table_label">#{msg.ADDRESSBOOK_NAME}</h:outputLabel>
 				<h:outputText id="addressbookName" value="#{addressbookController.addressbookName}" />
 
-				<h:outputLabel for="userProfileLink" class="table_label">#{msg.ADDRESSBOOK_OWNER}</h:outputLabel>
+				<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" class="table_label">#{msg.ADDRESSBOOK_CREATED}</h:outputLabel>
+				<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" class="table_label">#{msg.ADDRESSBOOK_STATUS}</h:outputLabel>
+				<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" class="notice" value="#{msg.USER_NOT_LOGGED_IN}" rendered="#{not loginController.isUserLoggedIn()}" />
-					<h:outputText id="ownProfileInvible" class="notice" value="#{msg.LOGIN_OWN_PROFILE_INVISIBLE}" rendered="#{loginController.isUserLoggedIn() and loginController.isInvisible()}" />
-
-					<ui:fragment rendered="#{loginController.isUserLoggedIn() and not loginController.isInvisible()}">
-						<h:link id="startSharing" outcome="login_start_sharing_addressbook" value="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK}" title="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOK_TITLE}" rendered="#{addressbookController.isOwnAddressbook()}" />
+					<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>
diff --git a/web/user/login_add_addressbook.xhtml b/web/user/login_add_addressbook.xhtml
index 7f1c8579..a3d17464 100644
--- a/web/user/login_add_addressbook.xhtml
+++ b/web/user/login_add_addressbook.xhtml
@@ -16,7 +16,7 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
 				<h:form id="add_addressbook" acceptcharset="utf-8">
 					<div class="table">
 						<div class="table_header">
@@ -29,21 +29,21 @@
 							</div>
 
 							<div class="table_right">
-								<h:inputText class="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}">
+								<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 class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_LOGIN_ADD_ADDRESSBOOK}" action="#{addressbookController.addAddressbook()}" />
+							<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 loginController.isUserLoggedIn()}">
+			<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>
diff --git a/web/user/login_change_email_address.xhtml b/web/user/login_change_email_address.xhtml
index 702312d8..49e5038e 100644
--- a/web/user/login_change_email_address.xhtml
+++ b/web/user/login_change_email_address.xhtml
@@ -33,7 +33,7 @@
 									</div>
 
 									<div class="table_right">
-										#{userController.emailAddress}
+										#{contactController.emailAddress}
 									</div>
 
 									<div class="clear"></div>
@@ -45,7 +45,7 @@
 									</div>
 
 									<div class="table_right">
-										<h:inputText class="input" id="emailAddress1" size="20" maxlength="255" value="#{emailChangeController.emailAddress1}" required="true" />
+										<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{emailChangeController.emailAddress}" required="true" />
 									</div>
 
 									<div class="clear"></div>
@@ -57,7 +57,7 @@
 									</div>
 
 									<div class="table_right">
-										<h:inputText class="input" id="emailAddress2" size="20" maxlength="255" value="#{emailChangeController.emailAddress2}" required="true" />
+										<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{emailChangeController.emailAddressRepeat}" required="true" />
 									</div>
 
 									<div class="clear"></div>
@@ -68,8 +68,8 @@
 						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
 						<div class="table_footer">
-							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
+							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+							<h:commandButton styleClass="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{emailChangeController.doChangeEmailAddress()}" />
 						</div>
 					</h:form>
 				</div>
diff --git a/web/user/login_change_password.xhtml b/web/user/login_change_password.xhtml
index bfd384d4..183c1b5d 100644
--- a/web/user/login_change_password.xhtml
+++ b/web/user/login_change_password.xhtml
@@ -16,7 +16,7 @@
 		</ui:define>
 
 		<ui:define name="content">
-			<ui:fragment rendered="#{loginController.isUserLoggedIn()}">
+			<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
 				<div class="table">
 					<div class="table_header">
 						#{msg.LOGIN_CHANGE_PASSWORD_TITLE}
@@ -33,7 +33,7 @@
 									</div>
 
 									<div class="table_right">
-										<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{loginController.userPassword}" required="true" />
+										<h:inputSecret styleClass="input" id="password1" size="10" maxlength="255" value="#{userLoginController.userPassword}" required="true" />
 									</div>
 
 									<div class="clear"></div>
@@ -45,7 +45,7 @@
 									</div>
 
 									<div class="table_right">
-										<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{loginController.userPasswordRepeat}" required="true" />
+										<h:inputSecret styleClass="input" id="password2" size="10" maxlength="255" value="#{userLoginController.userPasswordRepeat}" required="true" />
 									</div>
 
 									<div class="clear"></div>
@@ -56,14 +56,14 @@
 						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
 						<div class="table_footer">
-							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="change_password" value="#{msg.BUTTON_CHANGE_PASSWORD}" action="#{userController.changePassword()}" />
+							<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 loginController.isUserLoggedIn()}">
+			<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>
diff --git a/web/user/login_change_personal_data.xhtml b/web/user/login_change_personal_data.xhtml
index e4c482c9..72ad05df 100644
--- a/web/user/login_change_personal_data.xhtml
+++ b/web/user/login_change_personal_data.xhtml
@@ -23,15 +23,15 @@
 					</div>
 
 					<h:form id="login_change_personal_form">
-						<ui:include src="/WEB-INF/templates/generic/form_personal_data.tpl" />
+						<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
 						<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
 						<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
 						<div class="table_footer">
-							<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-							<h:commandButton class="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
+							<h:commandButton styleClass="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+							<h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
 						</div>
 					</h:form>
 				</div>