diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index cf36c9f..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.project
-.buildpath
-.settings
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e3b8cc6..05940cb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ ThemeKey 7.x-1.0-rc2, 2011-xx-xx
 [        ] mkalkbrenner: fixed fatal error in ThemekeyMultipleNodePropertiesTestCase
 [        ] mkalkbrenner: moved ThemeKey Example module to Development package
 [#1065878] mkalkbrenner: Error messages when activating all Themekey modules on a Standard English Drupal-7.0 installation
+[#1125920] mkalkbrenner: don't set $custom_theme to 'default'
 
 
 ThemeKey 7.x-1.0-rc1, 2011-02-11
diff --git a/themekey_debug.module b/themekey_debug.module
index 9f171d6..297a73c 100644
--- a/themekey_debug.module
+++ b/themekey_debug.module
@@ -110,10 +110,10 @@ function themekey_debug_init() {
     }
     else {
       global $theme;
-      $custom_theme = &drupal_static('themekey_custom_theme', '');
-      if (!empty($custom_theme) && 'default' != $custom_theme) {
-        if ($theme != $custom_theme) {
-          themekey_set_debug_message('Theme switching to custom theme "%custom_theme" did not work because theme has been set to "%theme" by another module.', array('%custom_theme' => $custom_theme, '%theme' => $theme), TRUE, TRUE);
+      $themekey_custom_theme = &drupal_static('themekey_custom_theme', '');
+      if (!empty($themekey_custom_theme) && 'default' != $themekey_custom_theme) {
+        if ($theme != $themekey_custom_theme) {
+          themekey_set_debug_message('Theme switching to custom theme "%custom_theme" did not work because theme has been set to "%theme" by another module.', array('%custom_theme' => $themekey_custom_theme, '%theme' => $theme), TRUE, TRUE);
         }
       }
       else {
diff --git a/themekey_ui.module b/themekey_ui.module
index 48f39c3..273f973 100644
--- a/themekey_ui.module
+++ b/themekey_ui.module
@@ -95,7 +95,7 @@ function themekey_ui_nid2theme($nid) {
 
   themekey_ui_node_load(array($node->nid => $node), array($node->type));
 
-  if (!empty($node->themekey_ui_theme) && themekey_check_theme_enabled($node->themekey_ui_theme)) {
+  if (!empty($node->themekey_ui_theme) && 'default' != $node->themekey_ui_theme && themekey_check_theme_enabled($node->themekey_ui_theme)) {
     $custom_theme = $node->themekey_ui_theme;
     return 'static';
   }
@@ -128,7 +128,7 @@ function themekey_ui_author2theme($nid) {
   $query->join('themekey_ui_author_theme', 'tuat', 'n.uid = tuat.uid');
 
   if ($theme = $query->execute()->fetchField()) {
-    if ('default' != $theme) {
+    if ('default' != $theme && themekey_check_theme_enabled($theme)) {
       $custom_theme = $theme;
       return 'static';
     }