Index: branches/5.3.x/core/units/helpers/user_helper.php
===================================================================
diff -u -N -r15928 -r16111
--- branches/5.3.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 15928)
+++ branches/5.3.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 16111)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_helper.php 15928 2013-07-30 10:03:45Z alex $
+* @version	$Id: user_helper.php 16111 2014-12-07 14:49:01Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -160,10 +160,15 @@
 		function loginUserById($user_id, $remember_login_cookie = false)
 		{
 			$object =& $this->getUserObject();
-			$this->Application->removeObject($object->getPrefixSpecial());
 
-			$this->Application->StoreVar('user_id', $user_id);
 			$this->Application->SetVar('u.current_id', $user_id);
+
+			if ( !$this->Application->isAdmin ) {
+				// needed for "profile edit", "registration" forms ON FRONT ONLY
+				$this->Application->SetVar('u_id', $user_id);
+			}
+
+			$this->Application->StoreVar('user_id', $user_id);
 			$this->Application->Session->SetField('PortalUserId', $user_id);
 
 			if ($user_id != USER_ROOT) {
@@ -482,7 +487,11 @@
 			// merge back url params, because they were ignored if this was "external:" url
 			$vars = array_merge($vars, $this->getRedirectParams($vars['pass'], 'pass'));
 
-			$template = $vars['t'];
+			if ( $template != 'index' ) {
+				// The 'index.html' becomes '', which in turn leads to current page instead of 'index.html'.
+				$template = $vars['t'];
+			}
+
 			unset($vars['is_virtual'], $vars['t']);
 
 			$this->event->redirect = $template;