diff --git a/admin/themes/default/template/profile_content.tpl b/admin/themes/default/template/profile_content.tpl
index 22be71cca..57dba40d1 100644
--- a/admin/themes/default/template/profile_content.tpl
+++ b/admin/themes/default/template/profile_content.tpl
@@ -55,6 +55,7 @@
+{if not $SPECIAL_USER}
@@ -67,6 +68,7 @@
{html_options id=language name=language options=$language_options selected=$language_selection}
+{/if}
diff --git a/profile.php b/profile.php
index ddc7a3452..8a36d131c 100644
--- a/profile.php
+++ b/profile.php
@@ -97,11 +97,14 @@ function save_profile_from_post($userdata, &$errors)
$special_user = in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']));
if ($special_user)
{
- unset($_POST['mail_address'],
- $_POST['password'],
- $_POST['use_new_pwd'],
- $_POST['passwordConf']
- );
+ unset(
+ $_POST['mail_address'],
+ $_POST['password'],
+ $_POST['use_new_pwd'],
+ $_POST['passwordConf'],
+ $_POST['theme'],
+ $_POST['language']
+ );
}
if ($conf['allow_user_customization'] or defined('IN_ADMIN'))