diff --git a/src/main/java/org/olat/core/util/i18n/ui/I18nConfigController.java b/src/main/java/org/olat/core/util/i18n/ui/I18nConfigController.java
index de3b1b13a472e8b11f514c28f72ea4f4c9b6980e..a49cb3bd4225d2b401baf2755c8ca6f98173b90f 100644
--- a/src/main/java/org/olat/core/util/i18n/ui/I18nConfigController.java
+++ b/src/main/java/org/olat/core/util/i18n/ui/I18nConfigController.java
@@ -100,9 +100,8 @@ class I18nConfigController extends FormBasicController {
 			defaultLangValues[i] = all;
 		}
 		ArrayHelper.sort(defaultlangKeys, defaultLangValues, false, true, false);
-		String[] defaultLangCssClasses = i18nMgr.createLanguageFlagsCssClasses(defaultlangKeys, "o_flag");
 		defaultLangSelection = uifactory.addDropdownSingleselect("configuration.defaultLangSelection", formLayout, defaultlangKeys,
-				defaultLangValues, defaultLangCssClasses);
+				defaultLangValues, null);
 		defaultLangSelection.addActionListener(FormEvent.ONCHANGE);
 		// Enable the current default language
 		Locale defaultLocale = I18nModule.getDefaultLocale();
diff --git a/src/main/java/org/olat/user/ProfileAndHomePageEditController.java b/src/main/java/org/olat/user/ProfileAndHomePageEditController.java
index ce63efe3d5a5a7b9d5c4ece0cd070227c747bed5..12141f19053172f65cfa869b96b95904f855691a 100644
--- a/src/main/java/org/olat/user/ProfileAndHomePageEditController.java
+++ b/src/main/java/org/olat/user/ProfileAndHomePageEditController.java
@@ -64,7 +64,7 @@ public class ProfileAndHomePageEditController extends BasicController implements
 	private boolean isAdministrativeUser;
 
 	public ProfileAndHomePageEditController(UserRequest ureq, WindowControl wControl) {		
-		this(ureq,wControl, ureq.getIdentity(), ureq.getUserSession().getRoles().isOLATAdmin());
+		this(ureq,wControl, ureq.getIdentity(), false);
 	}
 	
 	/**