Index: branches/RC/core/kernel/application.php
===================================================================
diff -u -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.'/';