Index: trunk/core/units/user_profile/user_profile_tp.php
===================================================================
diff -u -r8634 -r8636
--- trunk/core/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 8634)
+++ trunk/core/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 8636)
@@ -57,11 +57,23 @@
 
 				$sql = 'SELECT VariableValue, VariableName
 						FROM '.TABLE_PREFIX.'PersistantSessionData
-						WHERE (PortalUserId = '.$user_id.') AND (LENGTH(VariableValue) < 10)';
+						WHERE (PortalUserId = '.$user_id.')';
 				$cached_vars = $this->Conn->GetCol($sql, 'VariableName');
 			}
 
-			return isset($cached_vars[$var_name]) ? $cached_vars[$var_name] : false;
+			if (isset($cached_vars[$var_name])) {
+				// get variable value from persistent session
+				return $cached_vars[$var_name];
+			}
+			else {
+				// not found in persistent session -> get default value from config variable with same name
+				$config_value = $this->Application->ConfigValue($var_name);
+				if ($config_value !== false) {
+					return $config_value;
+				}
+			}
+
+			return false;
 		}
 
 		/**
@@ -122,6 +134,21 @@
 
 			return $counter < $this->ProfileFieldCount();
 		}
+
+		/**
+		 * Because of persistant session table doesn't have ids, we use user id as id for each record
+		 *
+		 * @param Array $params
+		 * @return Array (id,field)
+		 * @access private
+		 */
+		function prepareInputName($params)
+		{
+			list ($id, $field) = parent::prepareInputName($params);
+			$id = $this->Application->RecallVar('user_id');
+
+			return Array($id, $field);
+		}
 	}
 
 ?>
\ No newline at end of file
Index: trunk/kernel/units/user_profile/user_profile_tp.php
===================================================================
diff -u -r8634 -r8636
--- trunk/kernel/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 8634)
+++ trunk/kernel/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 8636)
@@ -57,11 +57,23 @@
 
 				$sql = 'SELECT VariableValue, VariableName
 						FROM '.TABLE_PREFIX.'PersistantSessionData
-						WHERE (PortalUserId = '.$user_id.') AND (LENGTH(VariableValue) < 10)';
+						WHERE (PortalUserId = '.$user_id.')';
 				$cached_vars = $this->Conn->GetCol($sql, 'VariableName');
 			}
 
-			return isset($cached_vars[$var_name]) ? $cached_vars[$var_name] : false;
+			if (isset($cached_vars[$var_name])) {
+				// get variable value from persistent session
+				return $cached_vars[$var_name];
+			}
+			else {
+				// not found in persistent session -> get default value from config variable with same name
+				$config_value = $this->Application->ConfigValue($var_name);
+				if ($config_value !== false) {
+					return $config_value;
+				}
+			}
+
+			return false;
 		}
 
 		/**
@@ -122,6 +134,21 @@
 
 			return $counter < $this->ProfileFieldCount();
 		}
+
+		/**
+		 * Because of persistant session table doesn't have ids, we use user id as id for each record
+		 *
+		 * @param Array $params
+		 * @return Array (id,field)
+		 * @access private
+		 */
+		function prepareInputName($params)
+		{
+			list ($id, $field) = parent::prepareInputName($params);
+			$id = $this->Application->RecallVar('user_id');
+
+			return Array($id, $field);
+		}
 	}
 
 ?>
\ No newline at end of file
Index: trunk/core/units/user_profile/user_profile_config.php
===================================================================
diff -u -r8615 -r8636
--- trunk/core/units/user_profile/user_profile_config.php	(.../user_profile_config.php)	(revision 8615)
+++ trunk/core/units/user_profile/user_profile_config.php	(.../user_profile_config.php)	(revision 8636)
@@ -6,7 +6,6 @@
 		'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
 		'EventHandlerClass' => Array('class' => 'UserProfileEventHandler', 'file' => 'user_profile_eh.php', 'build_event' => 'OnBuild'),
 		'TagProcessorClass' => Array('class' => 'UserProfileTagProcessor', 'file' => 'user_profile_tp.php', 'build_event' => 'OnBuild'),
-		'AutoLoad' => true,
 
 		'QueryString' => Array (
 			1 => 'id',
Index: trunk/core/units/user_profile/user_profile_eh.php
===================================================================
diff -u -r8615 -r8636
--- trunk/core/units/user_profile/user_profile_eh.php	(.../user_profile_eh.php)	(revision 8615)
+++ trunk/core/units/user_profile/user_profile_eh.php	(.../user_profile_eh.php)	(revision 8636)
@@ -10,6 +10,7 @@
 		{
 			parent::mapPermissions();
 			$permissions = Array (
+				'OnItemBuild'	=>	Array('subitem' => true),
 				'OnUpdate'	=>	Array('subitem' => true),
 			);
 
@@ -23,11 +24,17 @@
 		 */
 		function OnUpdate(&$event)
 		{
-			$items_info = $this->Application->GetVar('user_profile');
+			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+			list ($user_id, $field_values) = each($items_info);
 
-			foreach ($items_info as $variable_name => $variable_value) {
-				$this->Application->StorePersistentVar($variable_name, $variable_value);
+			if ($user_id != $this->Application->RecallVar('user_id')) {
+				// we are not updating own profile
+				return ;
 			}
+
+			foreach ($field_values as $variable_name => $variable_value) {
+				$this->Application->StorePersistentVar($variable_name, unhtmlentities($variable_value));
+			}
 		}
 
 
Index: trunk/kernel/units/user_profile/user_profile_config.php
===================================================================
diff -u -r8615 -r8636
--- trunk/kernel/units/user_profile/user_profile_config.php	(.../user_profile_config.php)	(revision 8615)
+++ trunk/kernel/units/user_profile/user_profile_config.php	(.../user_profile_config.php)	(revision 8636)
@@ -6,7 +6,6 @@
 		'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
 		'EventHandlerClass' => Array('class' => 'UserProfileEventHandler', 'file' => 'user_profile_eh.php', 'build_event' => 'OnBuild'),
 		'TagProcessorClass' => Array('class' => 'UserProfileTagProcessor', 'file' => 'user_profile_tp.php', 'build_event' => 'OnBuild'),
-		'AutoLoad' => true,
 
 		'QueryString' => Array (
 			1 => 'id',
Index: trunk/themes/default2007/platform/my_account/my_preferences.tpl
===================================================================
diff -u -r8634 -r8636
--- trunk/themes/default2007/platform/my_account/my_preferences.tpl	(.../my_preferences.tpl)	(revision 8634)
+++ trunk/themes/default2007/platform/my_account/my_preferences.tpl	(.../my_preferences.tpl)	(revision 8636)
@@ -26,6 +26,7 @@
 		<strong>Profile</strong><br /><br />
 
 		<form method="post" action="<inp2:m_FormAction/>">
+			<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
 			<table class="form-data fullwidth">
 				<tr>
 					<td style="width:140px">
@@ -73,15 +74,14 @@
 					<td>
 						&nbsp;
 					</td>
-					<td colspan="2">
+					<td>
 						<br />
 						<input class="button" type="submit" name="events[user-profile][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
-
-						<a href="<inp2:u.current_ProfileLink template="platform/my_account/public_profile"/>"><inp2:m_phrase name="lu_btn_ViewYourProfile"/></a>
-
 						<br /><br />
-
 					</td>
+					<td class="field-value">
+						<a href="<inp2:u.current_ProfileLink template="platform/my_account/public_profile"/>"><inp2:m_phrase name="lu_btn_ViewYourProfile"/></a>
+					</td>
 				</tr>
 			</table>
 		</form>
Index: trunk/kernel/units/user_profile/user_profile_eh.php
===================================================================
diff -u -r8615 -r8636
--- trunk/kernel/units/user_profile/user_profile_eh.php	(.../user_profile_eh.php)	(revision 8615)
+++ trunk/kernel/units/user_profile/user_profile_eh.php	(.../user_profile_eh.php)	(revision 8636)
@@ -10,6 +10,7 @@
 		{
 			parent::mapPermissions();
 			$permissions = Array (
+				'OnItemBuild'	=>	Array('subitem' => true),
 				'OnUpdate'	=>	Array('subitem' => true),
 			);
 
@@ -23,11 +24,17 @@
 		 */
 		function OnUpdate(&$event)
 		{
-			$items_info = $this->Application->GetVar('user_profile');
+			$items_info = $this->Application->GetVar($event->getPrefixSpecial(true));
+			list ($user_id, $field_values) = each($items_info);
 
-			foreach ($items_info as $variable_name => $variable_value) {
-				$this->Application->StorePersistentVar($variable_name, $variable_value);
+			if ($user_id != $this->Application->RecallVar('user_id')) {
+				// we are not updating own profile
+				return ;
 			}
+
+			foreach ($field_values as $variable_name => $variable_value) {
+				$this->Application->StorePersistentVar($variable_name, unhtmlentities($variable_value));
+			}
 		}
 
 
Index: trunk/themes/default2007/platform/designs/preferences.tpl
===================================================================
diff -u -r8634 -r8636
--- trunk/themes/default2007/platform/designs/preferences.tpl	(.../preferences.tpl)	(revision 8634)
+++ trunk/themes/default2007/platform/designs/preferences.tpl	(.../preferences.tpl)	(revision 8636)
@@ -3,8 +3,8 @@
 		<td class="field-name"><inp2:m_phrase name="$title"/></td>
 		<td><inp2:user-profile_Field field="$field" profile_field="1"/></td>
 		<td class="field-value">
-			<input type="hidden" id="user_profile[<inp2:m_param name="field"/>]" name="user_profile[<inp2:m_param name="field"/>]" value="<inp2:user-profile_Field field="$field"/>"/>
-			<input type="checkbox" id="_cb_user_profile[<inp2:m_param name="field"/>]" <inp2:user-profile_Field field="$field" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('user_profile[<inp2:m_param name="field"/>]'));"/>
+			<input type="hidden" id="<inp2:user-profile_InputName field="$field"/>" name="<inp2:user-profile_InputName field="$field"/>" value="<inp2:user-profile_Field field="$field"/>"/>
+			<input type="checkbox" id="_cb_<inp2:user-profile_InputName field="$field"/>" <inp2:user-profile_Field field="$field" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('<inp2:user-profile_InputName field="$field"/>'));"/>
 		</td>
 	</tr>
 	<inp2:m_if check="m_ParamEquals" name="is_last" value="0">