Index: nodehierarchy.module
===================================================================
--- nodehierarchy.module	(revision 18)
+++ nodehierarchy.module	(working copy)
@@ -347,13 +347,13 @@
           );
           if (user_access('administer menu') || variable_get('nodehierarchy_menu_noadmin', FALSE)) {
             $create_menu = variable_get('nh_createmenu_'. $node->type, 'optional_no');
-            if (($create_menu == 'optional_no' || $create_menu == 'optional_yes')) {
-              $form['nodehierarchy_create_menu']['#type'] = 'checkbox';
-            }
-
-            if ($create_menu == 'optional_yes' || $create_menu == 'always') {
+						if ($create_menu == 'always') {
               $form['nodehierarchy_create_menu']['#default_value'] = TRUE;
             }
+            elseif (($create_menu == 'optional_no' || $create_menu == 'optional_yes')) {
+              $form['nodehierarchy_create_menu']['#type'] = 'checkbox';
+							$form['nodehierarchy_create_menu']['#default_value'] = $node->nid ? $mid : ($create_menu == 'optional_yes');
+            }						
           }
         }
       }