Index: branches/5.1.x/core/install.php
===================================================================
diff -u -N -r13808 -r14112
--- branches/5.1.x/core/install.php	(.../install.php)	(revision 13808)
+++ branches/5.1.x/core/install.php	(.../install.php)	(revision 14112)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 13808 2010-06-25 18:07:07Z alex $
+* @version	$Id: install.php 14112 2011-01-05 11:00:20Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -735,6 +735,9 @@
 					$modules_helper =& $this->Application->recallObject('ModulesHelper');
 					/* @var $modules_helper kModulesHelper */
 
+					// get domain name as entered by user on the form
+					$domain = $this->GetVar('domain') == 1 ? $_SERVER['HTTP_HOST'] : str_replace(' ', '', $this->GetVar('other'));
+					
 					$license_hash = $this->toolkit->getSystemConfig('Intechnic', 'License');
 					if ($license_hash) {
 						// when license present, then extract domain from it
@@ -743,12 +746,10 @@
 						$license_domain = $license_keys[0]['domain'];
 					}
 					else {
-						// when license missing, then use current domain
-						$license_domain = $_SERVER['HTTP_HOST'];
+						// when license missing, then use current domain or domain entered by user
+						$license_domain = $domain;
 					}
 
-					$domain = $this->GetVar('domain') == 1 ? $_SERVER['HTTP_HOST'] : str_replace(' ', '', $this->GetVar('other'));
-
 					if ($domain != '') {
 						if (strstr($domain, $license_domain) || $modules_helper->_IsLocalSite($domain)) {
 							$this->toolkit->setSystemConfig('Misc', 'Domain', $domain);