Index: branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php
===================================================================
diff -u -r5922 -r5956
--- branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php	(.../application.php)	(revision 5922)
+++ branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php	(.../application.php)	(revision 5956)
@@ -1019,7 +1019,7 @@
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : null;
 		if ($ssl !== null) {
 			$session =& $this->recallObject('Session');
-			$cookie_url = $session->CookieDomain.$session->CookiePath;
+			$cookie_url = trim($session->CookieDomain.$session->CookiePath, '/.');
 			if ($ssl) {
 				$target_url = $this->ConfigValue('SSL_URL');
 			}
Index: branches/unlabeled/unlabeled-1.61.2/core/kernel/processors/main_processor.php
===================================================================
diff -u -r5954 -r5956
--- branches/unlabeled/unlabeled-1.61.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 5954)
+++ branches/unlabeled/unlabeled-1.61.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 5956)
@@ -874,6 +874,7 @@
 		else {
 			if (PROTOCOL == 'https://' && $this->Application->ConfigValue('Force_HTTP_When_SSL_Not_Required')) {
 				if ($this->Application->GetVar('__KEEP_SSL__')) return;
+				$pass = array('pass'=>'m', 'm_cat_id'=>0);
 				$this->Application->Redirect('', array_merge_recursive2($pass, Array('__SSL__' => 0)));
 			}
 		}