Index: branches/5.2.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r14955 -r14968
--- branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14955)
+++ branches/5.2.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 14968)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 14955 2011-12-30 10:48:28Z alex $
+* @version	$Id: users_event_handler.php 14968 2011-12-30 17:42:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -518,6 +518,10 @@
 			}
 
 			$object->SetDBField('IPAddress', $_SERVER['REMOTE_ADDR']);
+
+			if ( !$this->Application->isAdmin ) {
+				$object->SetDBField('FrontLanguage', $this->Application->GetVar('m_lang'));
+			}
 		}
 
 		/**
@@ -1630,6 +1634,21 @@
 
 			// get user subscription status
 			$object->SetDBField('SubscribeToMailing', $object->isSubscribed() ? 1 : 0);
+
+			if ( !$this->Application->isAdmin ) {
+				$list = $this->Application->recallObject('lang.enabled', 'lang_List');
+				/* @var $list kDBList */
+
+				$list->GoFirst();
+				$languages = Array ();
+
+				while (!$list->EOL()) {
+					$languages[$list->GetID()] = $list->GetField('LocalName');
+					$list->GoNext();
+				}
+
+				$object->SetFieldOption('FrontLanguage', 'options', $languages);
+			}
 		}
 
 		/**