diff --git a/www/sites/all/modules/contrib/computed_field/computed_field.module b/www/sites/all/modules/contrib/computed_field/computed_field.module
index a7b82e5..5b4e44a 100644
--- a/www/sites/all/modules/contrib/computed_field/computed_field.module
+++ b/www/sites/all/modules/contrib/computed_field/computed_field.module
@@ -47,11 +47,14 @@ function computed_field_entity_property_callback(&$info, $entity_type, $field, $
     // Entity API's defaults are pretty good so set the property_type and let
     // them do the work for us.
     $field_type['property_type'] = $property_types[$field['columns']['value']['type']];
-    entity_metadata_field_default_property_callback($info, $entity_type, $field, $instance, $field_type);
-    // The only thing is that a setter doesn't make sense, so let's disable it.
-    $property = &$info[$entity_type]['bundles'][$instance['bundle']]['properties'][$field['field_name']];
-    unset($property['setter callback']);
   }
+  else {
+    $field_type['property_type'] = $field['settings']['database']['data_type'];
+  }
+  entity_metadata_field_default_property_callback($info, $entity_type, $field, $instance, $field_type);
+  // The only thing is that a setter doesn't make sense, so let's disable it.
+  $property = &$info[$entity_type]['bundles'][$instance['bundle']]['properties'][$field['field_name']];
+  unset($property['setter callback']);
 }
 
 /**
@@ -120,10 +123,10 @@ function computed_field_field_settings_form($field, $instance, $has_data) {
   $form['database']['data_type'] = array(
     '#type' => 'radios',
     '#title' => t('Data Type'),
-    '#description' => t('The SQL datatype to store this field in.'),
+    '#description' => t('<p>The SQL datatype to store this field in.</p><p>This setting is used also when the field is not stored in the database to set the property type.</p>'),
     '#default_value' => !empty($settings['database']['data_type']) ? $settings['database']['data_type'] : 'varchar',
     '#options' => array('varchar' => 'varchar', 'text' => 'text', 'longtext' => 'longtext', 'int' => 'int', 'float' => 'float', 'numeric' => 'decimal'),
-    '#required' => FALSE,
+    '#required' => TRUE,
     '#disabled' => $has_data,
   );
   $form['database']['data_length'] = array(