Index: branches/RC/core/install/upgrades.sql
===================================================================
diff -u -N -r10667 -r10715
--- branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10667)
+++ branches/RC/core/install/upgrades.sql	(.../upgrades.sql)	(revision 10715)
@@ -304,4 +304,7 @@
 UPDATE PortalGroup SET FrontRegistration = 1 WHERE GroupId = 13;
 
 INSERT INTO ConfigurationAdmin VALUES ('ForceImageMagickResize', 'la_Text_Website', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.28, 0, 0);
-INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_general');
\ No newline at end of file
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_general');
+
+INSERT INTO ConfigurationAdmin VALUES ('AdminSSL_URL', 'la_Text_Website', 'la_config_AdminSSL_URL', 'text', '', '', 10.091, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdminSSL_URL', '', 'In-Portal', 'in-portal:configure_general');
\ No newline at end of file
Index: branches/RC/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r10610 -r10715
--- branches/RC/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 10610)
+++ branches/RC/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 10715)
@@ -974,7 +974,13 @@
 	 */
 	function CheckSSL($params)
 	{
-		$ssl = $this->Application->ConfigValue('SSL_URL');
+		$ssl = $this->Application->IsAdmin() ? $this->Application->ConfigValue('AdminSSL_URL') : false;
+
+		if (!$ssl) {
+			// not in admin or admin ssl url is empty
+			$ssl = $this->Application->ConfigValue('SSL_URL');
+		}
+
 		if (!$ssl) return; //SSL URL is not set - no way to require SSL
 
 		$require = false;
Index: branches/RC/core/install/install_data.sql
===================================================================
diff -u -N -r10637 -r10715
--- branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 10637)
+++ branches/RC/core/install/install_data.sql	(.../install_data.sql)	(revision 10715)
@@ -51,6 +51,7 @@
 INSERT INTO ConfigurationAdmin VALUES ('User_LoggedInGroup', 'la_Text_General', 'la_users_assign_all_to', 'select', NULL, '0=lu_none,<SQL+>SELECT GroupId as OptionValue, Name as OptionName FROM <PREFIX>PortalGroup WHERE Enabled=1 AND Personal=0</SQL>', 10.09, 0, 1);
 INSERT INTO ConfigurationAdmin VALUES ('FirstDayOfWeek', 'la_Text_Date_Time_Settings', 'la_config_first_day_of_week', 'select', '', '0=la_sunday,1=la_monday', 20.03, 0, 1);
 INSERT INTO ConfigurationAdmin VALUES ('SSL_URL', 'la_Text_Website', 'la_config_ssl_url', 'text', '', '', 10.09, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('AdminSSL_URL', 'la_Text_Website', 'la_config_AdminSSL_URL', 'text', '', '', 10.091, 0, 0);
 INSERT INTO ConfigurationAdmin VALUES ('Require_SSL', 'la_Text_Website', 'la_config_require_ssl', 'checkbox', '', '', 10.1, 0, 1);
 INSERT INTO ConfigurationAdmin VALUES ('Force_HTTP_When_SSL_Not_Required', 'la_Text_Website', 'la_config_force_http', 'checkbox', '', '', 10.11, 0, 1);
 INSERT INTO ConfigurationAdmin VALUES ('SessionCookieName', 'la_Text_Website', 'la_prompt_session_cookie_name', 'text', '', '', 10.04, 0, 1);
@@ -208,6 +209,7 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_MembershipExpirationReminder', '10', 'In-Portal:Users', 'in-portal:configure_users');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'FirstDayOfWeek', '1', 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SSL_URL', '', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdminSSL_URL', '', 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Require_SSL', '', 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Force_HTTP_When_SSL_Not_Required', '1', 'In-Portal', 'in-portal:configure_general');
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_general');
Index: branches/RC/admin/install/upgrades/inportal_upgrade_v4.3.1.sql
===================================================================
diff -u -N -r10637 -r10715
--- branches/RC/admin/install/upgrades/inportal_upgrade_v4.3.1.sql	(.../inportal_upgrade_v4.3.1.sql)	(revision 10637)
+++ branches/RC/admin/install/upgrades/inportal_upgrade_v4.3.1.sql	(.../inportal_upgrade_v4.3.1.sql)	(revision 10715)
@@ -10,6 +10,9 @@
 INSERT INTO ConfigurationAdmin VALUES ('ForceImageMagickResize', 'la_Text_Website', 'la_config_ForceImageMagickResize', 'checkbox', '', '', 10.28, 0, 0);
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'ForceImageMagickResize', '0', 'In-Portal', 'in-portal:configure_general');
 
+INSERT INTO ConfigurationAdmin VALUES ('AdminSSL_URL', 'la_Text_Website', 'la_config_AdminSSL_URL', 'text', '', '', 10.091, 0, 0);
+INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AdminSSL_URL', '', 'In-Portal', 'in-portal:configure_general');
+
 CREATE TABLE StatisticsCapture (StatisticsId int(10) unsigned NOT NULL auto_increment, TemplateName varchar(255) NOT NULL default '', Hits int(10) unsigned NOT NULL default '0', LastHit int(11) NOT NULL default '0', ScriptTimeMin decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', ScriptTimeAvg decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', ScriptTimeMax decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlTimeMin decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlTimeAvg decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlTimeMax decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlCountMin decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlCountAvg decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlCountMax decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', PRIMARY KEY  (StatisticsId), KEY TemplateName (TemplateName), KEY Hits (Hits), KEY LastHit (LastHit), KEY ScriptTimeMin (ScriptTimeMin), KEY ScriptTimeAvg (ScriptTimeAvg), KEY ScriptTimeMax (ScriptTimeMax), KEY SqlTimeMin (SqlTimeMin), KEY SqlTimeAvg (SqlTimeAvg), KEY SqlTimeMax (SqlTimeMax), KEY SqlCountMin (SqlCountMin), KEY SqlCountAvg (SqlCountAvg), KEY SqlCountMax (SqlCountMax));
 
 CREATE TABLE SlowSqlCapture (CaptureId int(10) unsigned NOT NULL auto_increment, TemplateNames text, Hits int(10) unsigned NOT NULL default '0', LastHit int(11) NOT NULL default '0', SqlQuery text, TimeMin decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', TimeAvg decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', TimeMax decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', QueryCrc int(11) NOT NULL default '0', PRIMARY KEY  (CaptureId), KEY Hits (Hits), KEY LastHit (LastHit), KEY TimeMin (TimeMin), KEY TimeAvg (TimeAvg), KEY TimeMax (TimeMax), KEY QueryCrc (QueryCrc));
Index: branches/RC/core/admin_templates/incs/header.tpl
===================================================================
diff -u -N -r10024 -r10715
--- branches/RC/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 10024)
+++ branches/RC/core/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 10715)
@@ -1,5 +1,7 @@
 <inp2:m_DefaultParam body_properties=""/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<inp2:m_CheckSSL mode="required" condition="Require_AdminSSL" />
+<inp2:m_CheckSSL/>
 <html>
 <head>
 <title><inp2:m_GetConfig var="Site_Name"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/></title>
Index: branches/RC/core/kernel/application.php
===================================================================
diff -u -N -r10610 -r10715
--- branches/RC/core/kernel/application.php	(.../application.php)	(revision 10610)
+++ branches/RC/core/kernel/application.php	(.../application.php)	(revision 10715)
@@ -1329,7 +1329,10 @@
 			$session =& $this->recallObject('Session');
 			$cookie_url = trim($session->CookieDomain.$session->CookiePath, '/.');
 			if ($ssl) {
-				$target_url = $this->ConfigValue('SSL_URL');
+				$target_url = defined('ADMIN') && ADMIN ? $this->ConfigValue('AdminSSL_URL') : false;
+				if (!$target_url) {
+					$target_url = $this->ConfigValue('SSL_URL');
+				}
 			}
 			else {
 				$target_url = 'http://'.DOMAIN.$this->ConfigValue('Site_Path');
@@ -1744,7 +1747,12 @@
 		}
 		else {
 			if ($ssl) {
-				return rtrim( $this->ConfigValue('SSL_URL'), '/').$prefix.'/';
+				$base_url = defined('ADMIN') && ADMIN ? $this->ConfigValue('AdminSSL_URL') : false;
+				if (!$base_url) {
+					$base_url = $this->ConfigValue('SSL_URL');
+				}
+
+				return rtrim($base_url, '/').$prefix.'/';
 			}
 			else {
 				return 'http://'.DOMAIN.(defined('PORT')?':'.PORT : '').rtrim( $this->ConfigValue('Site_Path'), '/').$prefix.'/';