Index: mythweb/includes/skin.php
===================================================================
--- mythweb/includes/skin.php	(revision 19227)
+++ mythweb/includes/skin.php	(working copy)
@@ -21,13 +21,12 @@
 */
 
 // Figure out the template
-    $tmpl = $_SESSION['tmpl'];
 
     if (isset($_REQUEST['RESET_TMPL']))
         $tmpl = _or($_REQUEST['RESET_TMPL'], 'default');
     elseif (isset($_REQUEST['RESET_TEMPLATE']))
         $tmpl = _or($_REQUEST['RESET_TEMPLATE'], 'default');
-    elseif (isset($_COOKIE['mythweb_tmpl']))
+    elseif (isset($_COOKIE['mythweb_tmpl']) && $_COOKIE['mythweb_tmpl'] == $_SESSION['tmpl'])
         $tmpl = $_COOKIE['mythweb_tmpl'];
     elseif (isMobileUser())
         $tmpl = 'wap';
@@ -36,7 +35,7 @@
     elseif (preg_match('/(ipod|iphone)/i', $_SERVER['HTTP_USER_AGENT']))
         $tmpl = 'iPod';
     else
-        $tmpl = 'default';
+        $tmpl = $_SESSION['tmpl'];
 
     if (!file_exists(modules_path.'/_shared/tmpl/'.$tmpl.'/welcome.php'))
         $tmpl = 'default';
@@ -44,18 +43,17 @@
     setcookie('mythweb_tmpl', $tmpl, 2147483647, root);
 
 // Figure out the skin
-    $skin = $_SESSION['skin'];
 
     if (isset($_REQUEST['RESET_SKIN']))
         $skin = _or($_REQUEST['RESET_SKIN'], 'default');
-    elseif (isset($_COOKIE['mythweb_skin']))
-        $skin = $_COOKIE['mythweb_skin'];
+    elseif (isset($_COOKIE['mythweb_skin']) && $_COOKIE['mythweb_skin'] == $_SESSION['skin'])
+       $skin = $_COOKIE['mythweb_skin'];
     elseif (isMobileUser())
         $skin = 'wap';
     elseif (preg_match('/(ipod|iphone)/i', $_SERVER['HTTP_USER_AGENT']))
         $skin = 'iPod-default';
     else
-        $skin = 'default';
+        $skin = $_SESSION['skin'];
 
     if (!file_exists('skins/'.$skin.'/img/'))
         $skin = 'default';