diff --git a/upload/config.php b/upload/config.php
index b2765e377..2c82e307a 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,7 +57,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 pre-stable';
 $bb_cfg['tp_release_date'] = '01-07-2013';
-$bb_cfg['tp_release_state'] = 'R510';
+$bb_cfg['tp_release_state'] = 'R511';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 20e5853f4..1b71d0e7e 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1550,7 +1550,7 @@ function setup_style ()
 	global $bb_cfg, $template, $userdata;
 
 	// AdminCP works only with default template
-	$tpl_dir_name = defined('IN_ADMIN') ? 'default'   : basename((IS_GUEST || empty($userdata['tpl_name'])) ? $bb_cfg['tpl_name'] : $userdata['tpl_name']);
+	$tpl_dir_name = defined('IN_ADMIN') ? 'default'   : basename($bb_cfg['tpl_name']);
 	$stylesheet   = defined('IN_ADMIN') ? 'main.css'  : basename($bb_cfg['stylesheet']);
 
 	if (!IS_GUEST && !empty($userdata['tpl_name']))