diff --git a/templates/bulletproof/config.inc.php b/templates/bulletproof/config.inc.php
index 2a355cdd..b9e7b2bf 100644
--- a/templates/bulletproof/config.inc.php
+++ b/templates/bulletproof/config.inc.php
@@ -268,7 +268,11 @@ $template_config = array(
     )
 );
 
-$template_loaded_config = &serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option']);
+if (isset($_POST['serendipity']['template'])) {
+  $template_loaded_config =$_POST['serendipity']['template'];
+} else {
+  $template_loaded_config = serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option']);
+}
 
 $navlinks = array();