Index: modules/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system.module,v
retrieving revision 1.284
diff -u -p -r1.284 system.module
--- modules/system.module	29 Jan 2006 07:28:52 -0000	1.284
+++ modules/system.module	1 Feb 2006 13:17:32 -0000
@@ -172,27 +172,30 @@ function system_user($type, $edit, &$use
       if (count($themes) > 1) {
         ksort($themes);
 
-        // Reset to follow site default theme if user selects the site default
-        if ($key == variable_get('theme_default', 'bluemarine')) {
-          $key = '';
-          if ($edit['theme'] == variable_get('theme_default', 'bluemarine')) {
-            $edit['theme'] = '';
-          }
-        }
-
         $form['themes'] = array(
           '#type' => 'fieldset', '#title' => t('Theme configuration'), '#description' => t('Selecting a different theme will change the look and feel of the site.'), '#weight' => 2, '#collapsible' => TRUE, '#theme' => 'system_user');
 
         foreach ($themes as $info) {
+          // Reset to follow site default theme if user selects the site default
+          if ($info->name == variable_get('theme_default', 'bluemarine')) {
+            $key = '';
+            if ($edit['theme'] == variable_get('theme_default', 'bluemarine')) {
+              $edit['theme'] = '';
+            }
+          }
+          else {
+            $key = $info->name;
+          }
+
           $info->screenshot = dirname($info->filename) . '/screenshot.png';
           $screenshot = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), false) : t('no screenshot');
 
-         $form['themes'][$info->name]['screenshot'] = array('#type' => 'markup', '#value' => $screenshot);
-          $form['themes'][$info->name]['description'] = array('#type' => 'item', '#title' => $info->name,  '#value' => dirname($info->filename));
-          $options[$info->name] = '';
+          $form['themes'][$key]['screenshot'] = array('#type' => 'markup', '#value' => $screenshot);
+          $form['themes'][$key]['description'] = array('#type' => 'item', '#title' => $info->name,  '#value' => dirname($info->filename));
+          $options[$key] = $info->name;          
         }
 
-        $form['themes']['theme'] = array('#type' => 'radios', '#options' => $options, '#default_value' => $edit['theme'] ? $edit['theme'] : variable_get('theme_default', 'bluemarine'));
+        $form['themes']['theme'] = array('#type' => 'radios', '#options' => $options, '#default_value' => $edit['theme'] ? $edit['theme'] : '');
       }
     }