Index: trunk/kernel/units/general/inp_ses_storage.php
===================================================================
diff -u -N -r4758 -r6428
--- trunk/kernel/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 4758)
+++ trunk/kernel/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 6428)
@@ -7,18 +7,25 @@
 			$this->SessionTimeout = $this->Application->ConfigValue('SessionTimeout');
 
 			$path = (BASE_PATH == '') ? '/' : BASE_PATH;
-			if ( $this->Application->IsAdmin() ) $path = rtrim($path, '/').'/admin';
+//			if ( $this->Application->IsAdmin() ) $path = rtrim($path, '/').'/admin';
 			$this->SetCookiePath($path);
 
 			$cookie_name = $this->Application->ConfigValue('SessionCookieName');
-			$this->SetCookieName($cookie_name ? $cookie_name : 'sid');
+			if (!$cookie_name) $cookie_name = 'sid';
+			if (($this->Application->IsAdmin() && $special !== 'front') || $special == 'admin' ) { //  || $this->Application->GetVar('admin') == 1
+				$cookie_name = 'adm_'.$cookie_name;
+			}
+			$this->SetCookieName($cookie_name);
 
 			$this->SetCookieDomain(SERVER_NAME);
 
-			if( $this->Application->IsAdmin() )
+			if( $this->Application->IsAdmin()) //  && $this->Application->GetVar('admin') != 1
 			{
 				$mode = constOn('IS_INSTALL') ? smCOOKIES_ONLY : smAUTO;
 			}
+			/*elseif ($this->Application->IsAdmin() && $this->Application->GetVar('admin') == 1) {
+				$mode = smCOOKIES_ONLY;
+			}*/
 			else
 			{
 				$ses_mode = $this->Application->ConfigValue('CookieSessions');