diff -upbrN modules/cck/optionwidgets.module modules/cck/optionwidgets.module
--- modules/cck/optionwidgets.module	2007-03-29 07:52:14.000000000 -0500
+++ modules/cck/optionwidgets.module	2007-06-02 17:35:26.000000000 -0500
@@ -108,12 +108,11 @@ function optionwidgets_widget($op, &$nod
         case 'options_onoff':
           // Display only the 'On' value of $options;
           $vals = array_keys($options);
-          $on_value = $vals[1];
+          $on_value = 1;
           $form[$field['field_name']]['keys'] = array(
             '#type' => 'checkbox',
-            '#title' => $options[$on_value],
+            '#title' => t($field['widget']['label']),
             '#default_value' => $items['default keys'][0],
-            '#return_value' => $on_value,
             '#description' => t($field['widget']['description']),
             '#required' => FALSE,
           );
@@ -162,7 +161,6 @@ function optionwidgets_widget($op, &$nod
       }
 
       if ($field['widget']['type'] == 'options_onoff' && empty($values)) {
-        $keys = array_keys($options);
         $values[] = $keys[0];
       }