Index: trunk/core/units/user_profile/user_profile_tp.php
===================================================================
diff -u -N -r8615 -r8620
--- trunk/core/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 8615)
+++ trunk/core/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 8620)
@@ -4,27 +4,20 @@
 
 		function Field($params)
 		{
+			$profile_mapping = $this->getProfileMapping();
 			$field = $this->SelectParam($params, 'name,field');
 
-			if (isset($params['user_value']) && $params['user_value']) {
-				$profile_mapping = Array (
-					'pp_firstname' => 'FirstName',
-					'pp_lastname' => 'LastName',
-					'pp_dob' => 'dob',
-					'pp_email' => 'Email',
-					'pp_phone' => 'Phone',
-					'pp_street' => 'Street',
-					'pp_city' => 'City',
-					'pp_state' => 'State',
-					'pp_zip' => 'Zip',
-					'pp_country' => 'Country',
-				);
-
+			if (isset($params['profile_field']) && $params['profile_field']) {
 				$params['name'] = $profile_mapping[$field];
-				$value = $this->Application->ProcessParsedTag('u.current', 'Field', $params);
+				$value = $this->Application->ProcessParsedTag('u.profile', 'Field', $params);
 			}
 			else {
-				$value = $this->Application->RecallPersistentVar($field);
+				$profile_user_id = $this->Application->GetVar('user_id');
+				if (!$profile_user_id) {
+					// if none user_id given use current user id
+					$profile_user_id = $this->Application->RecallVar('user_id');
+				}
+				$value = $this->recallUserProfileVar($profile_user_id, $field);
 			}
 
 			if (isset($params['checked']) && $params['checked']) {
@@ -34,6 +27,50 @@
 
 			return $value;
 		}
+
+		/**
+		 * Allows to get persistent var from other user
+		 *
+		 * @param int $user_id
+		 * @param string $var_name
+		 * @return mixed
+		 */
+		function recallUserProfileVar($user_id, $var_name)
+		{
+			static $cached_vars = null;
+
+			if (!isset($cached_vars)) {
+				$sql = 'SELECT VariableValue, VariableName
+						FROM '.TABLE_PREFIX.'PersistantSessionData
+						WHERE (PortalUserId = '.$user_id.') AND (LENGTH(VariableValue) < 10)';
+				$cached_vars = $this->Conn->GetCol($sql, 'VariableName');
+			}
+
+			return isset($cached_vars[$var_name]) ? $cached_vars[$var_name] : false;
+		}
+
+		/**
+		 * Returns mapping between persistent var name and user profile field
+		 *
+		 * @return Array
+		 */
+		function getProfileMapping()
+		{
+			$profile_mapping = Array (
+				'pp_firstname' => 'FirstName',
+				'pp_lastname' => 'LastName',
+				'pp_dob' => 'dob',
+				'pp_email' => 'Email',
+				'pp_phone' => 'Phone',
+				'pp_street' => 'Street',
+				'pp_city' => 'City',
+				'pp_state' => 'State',
+				'pp_zip' => 'Zip',
+				'pp_country' => 'Country',
+			);
+
+			return $profile_mapping;
+		}
 	}
 
 ?>
\ No newline at end of file
Index: trunk/kernel/units/user_profile/user_profile_tp.php
===================================================================
diff -u -N -r8615 -r8620
--- trunk/kernel/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 8615)
+++ trunk/kernel/units/user_profile/user_profile_tp.php	(.../user_profile_tp.php)	(revision 8620)
@@ -4,27 +4,20 @@
 
 		function Field($params)
 		{
+			$profile_mapping = $this->getProfileMapping();
 			$field = $this->SelectParam($params, 'name,field');
 
-			if (isset($params['user_value']) && $params['user_value']) {
-				$profile_mapping = Array (
-					'pp_firstname' => 'FirstName',
-					'pp_lastname' => 'LastName',
-					'pp_dob' => 'dob',
-					'pp_email' => 'Email',
-					'pp_phone' => 'Phone',
-					'pp_street' => 'Street',
-					'pp_city' => 'City',
-					'pp_state' => 'State',
-					'pp_zip' => 'Zip',
-					'pp_country' => 'Country',
-				);
-
+			if (isset($params['profile_field']) && $params['profile_field']) {
 				$params['name'] = $profile_mapping[$field];
-				$value = $this->Application->ProcessParsedTag('u.current', 'Field', $params);
+				$value = $this->Application->ProcessParsedTag('u.profile', 'Field', $params);
 			}
 			else {
-				$value = $this->Application->RecallPersistentVar($field);
+				$profile_user_id = $this->Application->GetVar('user_id');
+				if (!$profile_user_id) {
+					// if none user_id given use current user id
+					$profile_user_id = $this->Application->RecallVar('user_id');
+				}
+				$value = $this->recallUserProfileVar($profile_user_id, $field);
 			}
 
 			if (isset($params['checked']) && $params['checked']) {
@@ -34,6 +27,50 @@
 
 			return $value;
 		}
+
+		/**
+		 * Allows to get persistent var from other user
+		 *
+		 * @param int $user_id
+		 * @param string $var_name
+		 * @return mixed
+		 */
+		function recallUserProfileVar($user_id, $var_name)
+		{
+			static $cached_vars = null;
+
+			if (!isset($cached_vars)) {
+				$sql = 'SELECT VariableValue, VariableName
+						FROM '.TABLE_PREFIX.'PersistantSessionData
+						WHERE (PortalUserId = '.$user_id.') AND (LENGTH(VariableValue) < 10)';
+				$cached_vars = $this->Conn->GetCol($sql, 'VariableName');
+			}
+
+			return isset($cached_vars[$var_name]) ? $cached_vars[$var_name] : false;
+		}
+
+		/**
+		 * Returns mapping between persistent var name and user profile field
+		 *
+		 * @return Array
+		 */
+		function getProfileMapping()
+		{
+			$profile_mapping = Array (
+				'pp_firstname' => 'FirstName',
+				'pp_lastname' => 'LastName',
+				'pp_dob' => 'dob',
+				'pp_email' => 'Email',
+				'pp_phone' => 'Phone',
+				'pp_street' => 'Street',
+				'pp_city' => 'City',
+				'pp_state' => 'State',
+				'pp_zip' => 'Zip',
+				'pp_country' => 'Country',
+			);
+
+			return $profile_mapping;
+		}
 	}
 
 ?>
\ No newline at end of file
Index: trunk/themes/default2007/platform/elements/header.tpl
===================================================================
diff -u -N -r8514 -r8620
--- trunk/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 8514)
+++ trunk/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 8620)
@@ -1,10 +1,9 @@
 <table class="top-background fullwidth">
 	<tr>
 		<td width="203">
-			<a href=""><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/inportal_logo.gif" width="203" height="54" alt="" /><br /></a>
+			<a href="<inp2:m_Link template="index" m_cat_id="0"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/inportal_logo.gif" width="203" height="54" alt="" /></a><br />
 		</td>
 		<td align="right">
-		
 			<table style="width:auto">
 				<tr>
 					<td class="languages-paddings">
@@ -17,11 +16,11 @@
 								</inp2:m_DefineElement>
 								<inp2:lang_ListLanguages render_as="lang_elem" row_start_render_as="html:" row_end_render_as="html:"/>
 							</select>
-						</form>						
+						</form>
 					</td>
 					<td width="1">
 						<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/languages_separator.gif" width="1" height="22" alt="" />
-					</td>	
+					</td>
 					<td class="languages-paddings">
 						<form method="post" name="cur_form" id="cur_form" action="<inp2:m_FormAction />">
 							&nbsp; <inp2:m_Phrase label="lu_YourCurrency"/>:
@@ -32,11 +31,11 @@
 								</inp2:m_DefineElement>
 								<inp2:curr_ListCurrencies render_as="currency" row_start_render_as="html:" row_end_render_as="html:"/>
 							</select>
-						</form>						
-					</td>									
+						</form>
+					</td>
 				</tr>
 			</table>
-			
-		</td>		
+
+		</td>
 	</tr>
 </table>
\ No newline at end of file
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r8428 -r8620
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 8428)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 8620)
@@ -1102,13 +1102,30 @@
 		 *
 		 * @param kEvent $event
 		 */
-		function getPassedId(&$event)
+		function getPassedID(&$event)
 		{
-			if ($event->Special == 'ord') {
-				$order =& $this->Application->recallObject('ord');
-				return $order->GetDBField('PortalUserId');
+			switch ($event->Special) {
+				case 'ord':
+					$order =& $this->Application->recallObject('ord');
+					/* @var $order OrdersItem */
+
+					$id = $order->GetDBField('PortalUserId');
+					break;
+
+				case 'profile':
+					$id = $this->Application->GetVar('user_id');
+					if (!$id) {
+						// if none user_id given use current user id
+						$id = $this->Application->RecallVar('user_id');
+					}
+					break;
+
+				default:
+					$id = parent::getPassedID($event);
+					break;
 			}
-			return parent::getPassedID($event);
+
+			return $id;
 		}
 
 		/**
Index: trunk/themes/default2007/platform/my_account/my_favorites.tpl
===================================================================
diff -u -N -r8599 -r8620
--- trunk/themes/default2007/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 8599)
+++ trunk/themes/default2007/platform/my_account/my_favorites.tpl	(.../my_favorites.tpl)	(revision 8620)
@@ -19,11 +19,11 @@
 
 	<!-- my favorites -->
 	<inp2:m_RenderElement design="content_box">
+		<inp2:m_ModuleInclude template="elements/content_boxes/my_favorites"/>
+
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_MyFavorites"/>
-		<inp2:m_Capture/>
-
-		<inp2:m_ModuleInclude template="elements/content_boxes/my_favorites"/>
+		</inp2:m_Capture>
 	</inp2:m_RenderElement>
 
 	<!-- // my favorites -->
Index: trunk/themes/default2007/index.tpl
===================================================================
diff -u -N -r8521 -r8620
--- trunk/themes/default2007/index.tpl	(.../index.tpl)	(revision 8521)
+++ trunk/themes/default2007/index.tpl	(.../index.tpl)	(revision 8620)
@@ -9,7 +9,19 @@
 
 <inp2:m_DefineElement name="content">
 	<inp2:m_include template="platform/elements/navigation_bar"/>
-	Index Page
+
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
+			<inp2:m_phrase name="lu_title_WelcomeTitle"/>
+		</inp2:m_Capture>
+
+		In-portal is a revolutionary web site management system that allows you to automate and
+		facilitate management of large portal and community web sites. Regardless of whether you
+		are running a directory site or a content news portal, a community site or an online mall,
+		In-portal will enhance your web site management experience with innovative.
+	</inp2:m_RenderElement>
+
+	<inp2:m_ModuleInclude template="elements/content_boxes/pick_items" data_exists="1"/>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design" pass_params="1"/>
\ No newline at end of file
Index: trunk/themes/default2007/platform/designs/preferences.tpl
===================================================================
diff -u -N -r8615 -r8620
--- trunk/themes/default2007/platform/designs/preferences.tpl	(.../preferences.tpl)	(revision 8615)
+++ trunk/themes/default2007/platform/designs/preferences.tpl	(.../preferences.tpl)	(revision 8620)
@@ -1,7 +1,7 @@
 <inp2:m_DefineElement name="privacy_element">
 	<tr>
 		<td class="field-name"><inp2:m_phrase name="$title"/></td>
-		<td><inp2:user-profile_Field field="$field" user_value="1"/></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"/>]'));"/>
Index: trunk/themes/default2007/platform/my_account/my_account.tpl
===================================================================
diff -u -N -r8599 -r8620
--- trunk/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 8599)
+++ trunk/themes/default2007/platform/my_account/my_account.tpl	(.../my_account.tpl)	(revision 8620)
@@ -14,7 +14,7 @@
 	<inp2:m_RenderElement design="content_box">
 		<inp2:m_Capture to_var="header">
 			<inp2:m_phrase name="lu_title_MyAccount"/>
-		<inp2:m_Capture/>
+		</inp2:m_Capture>
 
 		my account big
 	</inp2:m_RenderElement>