diff --git a/modules/users/inc/users.edit.php b/modules/users/inc/users.edit.php
index 41407c3d..e201254f 100644
--- a/modules/users/inc/users.edit.php
+++ b/modules/users/inc/users.edit.php
@@ -91,9 +91,11 @@
 	$ruser['user_banexpire'] = cot_import('ruserbanexpire','P','INT');
 	$ruser['user_country'] = cot_import('rusercountry','P','ALP');
 	$ruser['user_text'] = cot_import('rusertext','P','HTM');
+	$rtheme = explode(':', cot_import('rusertheme','P','TXT'));
+	$ruser['user_theme'] = $rtheme[0];
+	$ruser['user_scheme'] = $rtheme[1];
 	$ruser['user_email'] = cot_import('ruseremail','P','TXT');
 	$ruser['user_hideemail'] = cot_import('ruserhideemail','P','INT');
-	$ruser['user_theme'] = cot_import('rusertheme','P','TXT');
 	$ruser['user_lang'] = cot_import('ruserlang','P','ALP');
 	$ruser['user_gender'] = cot_import('rusergender','P','TXT');
 
@@ -287,8 +289,8 @@
 	'USERS_EDIT_NAME' => cot_inputbox('text', 'rusername', $urr['user_name'], array('size' => 32, 'maxlength' => 100) + $protected),
 	'USERS_EDIT_ACTIVE' => $user_form_active,
 	'USERS_EDIT_BANNED' => $user_form_banned,
-	'USERS_EDIT_THEME' => cot_inputbox('text', 'rusertheme', $urr['user_theme'], array('size' => 32, 'maxlength' => 32)),
-	'USERS_EDIT_LANG' => cot_inputbox('text', 'ruserlang', $urr['user_lang'], array('size' => 32, 'maxlength' => 32)),
+	'USERS_EDIT_THEME' => cot_selectbox_theme($urr['user_theme'], $urr['user_scheme'], 'rusertheme'),
+	'USERS_EDIT_LANG' => cot_selectbox_lang($urr['user_lang'], 'ruserlang'),
 	'USERS_EDIT_NEWPASS' => cot_inputbox('password', 'rusernewpass', '', array('size' => 12, 'maxlength' => 32, 'autocomplete' => 'off') + $protected),
 	'USERS_EDIT_MAINGRP' => cot_build_group($urr['user_maingrp']),
 	'USERS_EDIT_GROUPS' => cot_build_groupsms($urr['user_id'], $usr['isadmin'], $urr['user_maingrp']),
diff --git a/modules/users/users.setup.php b/modules/users/users.setup.php
index 0be1aaf2..6d83af4d 100644
--- a/modules/users/users.setup.php
+++ b/modules/users/users.setup.php
@@ -3,10 +3,10 @@
 [BEGIN_COT_EXT]
 Name=Users
 Description=Users registration and profiles
-Version=0.9.4.3
-Date=2011-08-27
+Version=0.9.4.4
+Date=2015-08-07
 Author=Neocrome & Cotonti Team
-Copyright=(c) Cotonti Team 2008-2011
+Copyright=(c) Cotonti Team 2008-2015
 Notes=BSD License
 Auth_guests=R
 Lock_guests=A
diff --git a/system/functions.php b/system/functions.php
index 7f0cb06e..c209389e 100644
--- a/system/functions.php
+++ b/system/functions.php
@@ -2149,6 +2149,7 @@ function cot_generate_usertags($user_data, $tag_prefix = '', $emptyname='', $all
 				'EMAIL' => cot_build_email($user_data['user_email'], $user_data['user_hideemail']),
 				'THEME' => $user_data['user_theme'],
 				'SCHEME' => $user_data['user_scheme'],
+				'LANG' => $user_data['user_lang'],
 				'GENDER' => ($user_data['user_gender'] == '' || $user_data['user_gender'] == 'U') ? '' : $L['Gender_' . $user_data['user_gender']],
 				'BIRTHDATE' => (is_null($user_data['user_birthdate'])) ? '' : cot_date('date_full', $user_data['user_birthdate']),
 				'BIRTHDATE_STAMP' => (is_null($user_data['user_birthdate'])) ? '' : $user_data['user_birthdate'],