Index: branches/5.2.x/core/kernel/session/session_storage.php
===================================================================
diff -u -r16654 -r16793
--- branches/5.2.x/core/kernel/session/session_storage.php	(.../session_storage.php)	(revision 16654)
+++ branches/5.2.x/core/kernel/session/session_storage.php	(.../session_storage.php)	(revision 16793)
@@ -1,7 +1,7 @@
 <?php
 
 /**
-* @version	$Id: session_storage.php 16654 2021-01-04 08:42:52Z alex $
+* @version	$Id: session_storage.php 16793 2024-07-29 10:55:10Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -141,6 +141,9 @@
 			$this->SetField($field_name, $field_value);
 		}
 
+		// Reset change flags, because session is already saved to the database.
+		$this->ChangedDirectVars = array();
+
 		// ensure user groups are stored in a way, that kPermissionsHelper::CheckUserPermission can understand
 		$this->Session->StoreVar('UserGroups', $this->GetField('GroupList'), !$to_database);
 	}
@@ -254,6 +257,7 @@
 		if ( $replace != '' ) {
 			$query = ' REPLACE INTO ' . $this->SessionDataTable . ' (' . $this->IDField . ', ' . $this->DataVarField . ', ' . $this->DataValueField . ') VALUES ' . $replace;
 			$this->Conn->Query($query);
+			$this->OriginalData = $ses_data;
 		}
 
 		if ( $this->ChangedDirectVars ) {
@@ -267,6 +271,7 @@
 						SET ' . implode(',', $changes) . '
 						WHERE ' . $this->IDField . ' = ' . $this->Conn->qstr($this->Session->GetID());
 			$this->Conn->Query($query);
+			$this->ChangedDirectVars = array();
 		}
 	}
 
Index: branches/5.2.x/core/units/helpers/user_helper.php
===================================================================
diff -u -r16789 -r16793
--- branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 16789)
+++ branches/5.2.x/core/units/helpers/user_helper.php	(.../user_helper.php)	(revision 16793)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_helper.php 16789 2024-06-17 15:16:56Z alex $
+* @version	$Id: user_helper.php 16793 2024-07-29 10:55:10Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -189,6 +189,8 @@
 				$this->Application->StorePersistentVar('ThisLogin', adodb_mktime());
 			}
 
+			$this->Application->Session->SaveData();
+
 			$hook_event = new kEvent('u:OnAfterLogin');
 			$hook_event->MasterEvent = $this->event;
 			$this->Application->HandleEvent($hook_event);