--- includes/theme.inc	Mon Apr 17 22:48:25 2006
+++ includes/theme.inc	Wed May 24 14:07:34 2006
@@ -304,6 +304,9 @@ function theme_get_setting($setting_name
       elseif ($settings['logo_path']) {
         $settings['logo'] = base_path() . $settings['logo_path'];
       }
+      else {
+        $settings['toggle_logo'] = 0;
+      }
     }
 
     if ($settings['toggle_favicon']) {
@@ -317,6 +320,9 @@ function theme_get_setting($setting_name
       }
       elseif ($settings['favicon_path']) {
         $settings['favicon'] = base_path() . $settings['favicon_path'];
+      }
+      else {
+        $settings['toggle_favicon'] = 0;
       }
     }
   }