Index: branches/5.1.x/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r13545 -r13559
--- branches/5.1.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 13545)
+++ branches/5.1.x/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 13559)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: users_event_handler.php 13545 2010-05-11 19:19:58Z alex $
+* @version	$Id: users_event_handler.php 13559 2010-05-12 09:36:46Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1370,7 +1370,15 @@
 			parent::OnAfterConfigRead($event);
 
 			// 1. arrange user registration countries
-			$first_country = $this->Application->ConfigValue('User_Default_Registration_Country');
+			$site_helper =& $this->Application->recallObject('SiteHelper');
+			/* @var $site_helper SiteHelper */
+
+			$first_country = $site_helper->getDefaultCountry('', false);
+
+			if ($first_country === false) {
+				$first_country = $this->Application->ConfigValue('User_Default_Registration_Country');
+			}
+
 			if ($first_country) {
 				// update user country dropdown sql
 				$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
@@ -1414,7 +1422,6 @@
 					$this->Application->setUnitOption($event->Prefix, 'EditTabPresets', $edit_tab_presets);
 				}
 			}
-
 		}
 
 		/**