diff --git a/field_conditional_state/field_conditional_state.admin.inc b/field_conditional_state/field_conditional_state.admin.inc
index 96c6888..113d66c 100644
--- a/field_conditional_state/field_conditional_state.admin.inc
+++ b/field_conditional_state/field_conditional_state.admin.inc
@@ -21,25 +21,20 @@ function field_conditional_state_settings_form($form, &$form_state, $instance) {
   $control_instances = field_conditional_state_get_control_instances($bundle_instances);
   
   $form['#tree'] = TRUE;
-  $form['add_field_state']['field_name'] = array(
-    '#type'  => 'item', 
-    '#title' => t('Field @field is', array('@field' => $instance['label'])), 
-  );
-  $form['add_field_state']['state_type'] = array(
-    '#type'    => 'select', 
-    '#options' => drupal_map_assoc($states_types),
-  );
-  $form['add_field_state']['when'] = array(
-    '#type'  => 'item', 
-    '#title' => t('when field'), 
-  );
-  $form['add_field_state']['control_field'] = array(
-    '#type'  => 'item', 
-    '#title' => t('No control field to select !'),
-  );
 
-  $options = array();
   if ($control_instances) {
+    $form['add_field_state']['field_name'] = array(
+      '#type'  => 'item',
+      '#title' => t('Field @field is', array('@field' => $instance['label'])),
+    );
+    $form['add_field_state']['state_type'] = array(
+      '#type'    => 'select',
+      '#options' => drupal_map_assoc($states_types),
+    );
+    $form['add_field_state']['when'] = array(
+      '#type'  => 'item',
+      '#title' => t('when field'),
+    );
     $form['add_field_state']['control_field'] = array(
       '#type'    => 'select', 
       '#options' => field_conditional_state_get_instances_labels($control_instances),
@@ -80,64 +75,70 @@ function field_conditional_state_settings_form($form, &$form_state, $instance) {
         )
       );
     }
-  }
-  $form['add_field_state']['condition_type'] = array(
-    '#title' => t('Condition type'),
-    '#type'     => 'select',
-    '#description' => t('OR -> any choice will control field, <br /> AND -> all choices must be selected to control field'),
-    '#options'  => array('or'=>'OR', 'and'=>'AND'),
-  );
-  $form['trigger_field'] = array(
-    '#type'  => 'hidden',
-    '#value' => $instance['field_name'],
-  );
-  $form['bundle'] = array(
-    '#type'  => 'hidden',
-    '#value' => $bundle,
-  );
-  if ($control_instances && isset($options)) {
+
+    $form['add_field_state']['condition_type'] = array(
+      '#title' => t('Condition type'),
+      '#type'     => 'select',
+      '#description' => t('OR -> any choice will control field, <br /> AND -> all choices must be selected to control field'),
+      '#options'  => array('or'=>'OR', 'and'=>'AND'),
+    );
+    $form['trigger_field'] = array(
+      '#type'  => 'hidden',
+      '#value' => $instance['field_name'],
+    );
+    $form['bundle'] = array(
+      '#type'  => 'hidden',
+      '#value' => $bundle,
+    );
     $form['submit'] = array(
       '#type'  => 'submit',
       '#value' => t('Add condition'),
       '#name'  => 'add_condition',
-     );
-  }
-  $field_conditional_states = field_conditional_state_get_field_conditions($instance['field_name'], $bundle);
-  if (isset($field_conditional_states)) {
-    foreach ($field_conditional_states as $condition_id => $condition_settings) {
-      $trigger_values = array();
-      $options = $control_element[$condition_settings['control_field']]['#options'];
-      if (isset($condition_settings['trigger_values'])) {
-        foreach ($condition_settings['trigger_values'] as $val) {
-          $trigger_values[$val] = $options[$val];
+    );
+
+    $field_conditional_states = field_conditional_state_get_field_conditions($instance['field_name'], $bundle);
+    if (isset($field_conditional_states)) {
+      foreach ($field_conditional_states as $condition_id => $condition_settings) {
+        $trigger_values = array();
+        $options = $control_element[$condition_settings['control_field']]['#options'];
+        if (isset($condition_settings['trigger_values'])) {
+          foreach ($condition_settings['trigger_values'] as $val) {
+            $trigger_values[$val] = $options[$val];
+          }
+          $condition_type = t('@c', array('@c' => $condition_settings['condition_type']));
+          $trigger_values = implode(" $condition_type ", $trigger_values);
         }
-        $condition_type = t('@c', array('@c' => $condition_settings['condition_type']));
-        $trigger_values = implode(" $condition_type ", $trigger_values);
-      }
-      $placeholders = array(
-        '%target_field' => $instance['label'],
-        '@state' => $condition_settings['state'],
-        '%control_field' => $bundle_instances[$condition_settings['control_field']]['label'],
-        '@trigger_values' => $trigger_values,
-      );
-      $value = t('Field %target_field is @state when field %control_field has value @trigger_values', $placeholders);
-      $id = $condition_settings['id'];
+        $placeholders = array(
+          '%target_field' => $instance['label'],
+          '@state' => $condition_settings['state'],
+          '%control_field' => $bundle_instances[$condition_settings['control_field']]['label'],
+          '@trigger_values' => $trigger_values,
+        );
+        $value = t('Field %target_field is @state when field %control_field has value @trigger_values', $placeholders);
+        $id = $condition_settings['id'];
 
-      $form['field_states'][$condition_id]['condition'] = array(
-        '#type'  => 'item', 
-        '#title' => filter_xss($value),
-      );
-      $form['field_states'][$condition_id]['delete'] = array(
-        '#type'  => 'hidden',
-        '#value' => $id,
-      );
-      $form['field_states'][$condition_id]['submit'] = array(
-        '#type'  => 'submit',
-        '#value' => t('Delete condition'),
-        '#name'  => 'delete_condition_' . $id,
-      );
+        $form['field_states'][$condition_id]['condition'] = array(
+          '#type'  => 'item',
+          '#title' => filter_xss($value),
+        );
+        $form['field_states'][$condition_id]['delete'] = array(
+          '#type'  => 'hidden',
+          '#value' => $id,
+        );
+        $form['field_states'][$condition_id]['submit'] = array(
+          '#type'  => 'submit',
+          '#value' => t('Delete condition'),
+          '#name'  => 'delete_condition_' . $id,
+        );
+      }
     }
   }
+  else {
+    $form['add_field_state']['control_field'] = array(
+      '#type'  => 'item',
+      '#title' => t('No control field to select !'),
+    );
+  }
   return $form;
 }