Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/template.php,v
retrieving revision 1.36.2.10
diff -u -r1.36.2.10 template.php
--- template.php	20 Oct 2008 10:01:57 -0000	1.36.2.10
+++ template.php	22 Oct 2008 08:05:16 -0000
@@ -42,18 +42,18 @@
    */
   // get users role
   global $user;
-  if ($user->uid) {
+  if ($user->uid != 1) {
     $role = end(array_keys($user->roles));
     $rootcandy_navigation = theme_get_setting('rootcandy_navigation_source_'.$role);
   }
   else {
-    $rootcandy_navigation = theme_get_setting('rootcandy_navigation_source_1');
+    $rootcandy_navigation = '_rootcandy_default_navigation';
   }
 
-  if ($rootcandy_navigation) {
-    $menu_tree = menu_navigation_links($rootcandy_navigation);
+  if (!$rootcandy_navigation) {
+    $menu_tree[] = array('href' => 'user/login', 'title' => t('User login'));
   }
-  else {
+  elseif ($rootcandy_navigation == '_rootcandy_default_navigation') {
     // build default menu
     $menu_tree[] = array('href' => 'admin', 'title' => t('Dashboard'));
     $menu_tree[] = array('href' => 'admin/content', 'title' => t('Content'));
@@ -66,6 +66,9 @@
     $menu_tree[] = array('href' => 'admin/reports', 'title' => t('Reports'));
     $menu_tree[] = array('href' => 'admin/help', 'title' => t('Help'));
   }
+  else {
+    $menu_tree = menu_navigation_links($rootcandy_navigation);
+  }
 
   if ($menu_tree) {
     $output = '<ul>';

Index: theme-settings.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/theme-settings.php,v
retrieving revision 1.6.2.7
diff -u -r1.6.2.7 theme-settings.php
--- theme-settings.php	19 Oct 2008 10:42:05 -0000	1.6.2.7
+++ theme-settings.php	21 Oct 2008 13:59:22 -0000
@@ -94,8 +94,11 @@
     '#collapsed' => TRUE,
   );
 
-  $menu_options = menu_get_menus();
-  $primary_options = array_merge($menu_options, array('' => t('default navigation')));
+  $primary_options = array(
+    NULL => t('None'),
+    '_rootcandy_default_navigation' => t('default navigation'),
+  );
+  $primary_options = array_merge($primary_options, menu_get_menus());
   $roles = user_roles(FALSE);
   foreach ($roles as $rid => $role) {
     $form['navigation']['nav-by-role']['rootcandy_navigation_source_'. $rid] = array(