diff --git a/src/main/java/org/olat/user/ChangePasswordForm.java b/src/main/java/org/olat/user/ChangePasswordForm.java
index e86bf998a3f9c7e963f21987008fb7efd17a184b..913d9efd114c9597ab543c8f48a01f62873b4c71 100644
--- a/src/main/java/org/olat/user/ChangePasswordForm.java
+++ b/src/main/java/org/olat/user/ChangePasswordForm.java
@@ -110,13 +110,16 @@ public class ChangePasswordForm extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-
 		oldpass = uifactory.addPasswordElement("oldpass", "form.password.old", 128, "", formLayout);
+		oldpass.setElementCssClass("o_sel_home_pwd_old");
 		newpass1 = uifactory.addPasswordElement("newpass1",  "form.password.new1", 128, "", formLayout);
+		newpass1.setElementCssClass("o_sel_home_pwd_new_1");
 		newpass2 = uifactory.addPasswordElement("newpass2",  "form.password.new2", 128, "", formLayout);
+		newpass2.setElementCssClass("o_sel_home_pwd_new_2");
 		
 		// Button layout
 		FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("button_layout", getTranslator());
+		buttonLayout.setElementCssClass("o_sel_home_pwd_buttons");
 		formLayout.add(buttonLayout);
 		uifactory.addFormSubmitButton("submit", buttonLayout);
 		uifactory.addFormCancelButton("cancel", buttonLayout, ureq, getWindowControl());	
diff --git a/src/main/java/org/olat/user/PreferencesFormController.java b/src/main/java/org/olat/user/PreferencesFormController.java
index d090dfd79fd7327c551f374e0d16517984877294..5be5c99e37a8353b289fb9e1a1668795f462fdb6 100644
--- a/src/main/java/org/olat/user/PreferencesFormController.java
+++ b/src/main/java/org/olat/user/PreferencesFormController.java
@@ -219,7 +219,7 @@ public class PreferencesFormController extends FormBasicController {
 		String currentCharset = UserManager.getInstance().getUserCharset(tobeChangedIdentity);
 		String[] csKeys = StringHelper.getMapKeysAsStringArray(charsets);
 		charset = uifactory.addDropdownSingleselect("form.charset", formLayout, csKeys, csKeys, null);
-		charset.setElementCssClass("o_sel_home_settings_cahrset");
+		charset.setElementCssClass("o_sel_home_settings_charset");
 		charset.select(currentCharset, true);
 
 		// Submit and cancel buttons