diff -up imagefield_avatar/imagefield_avatar.admin.inc imagefield_avatarNew/imagefield_avatar.admin.inc
--- imagefield_avatar/imagefield_avatar.admin.inc	2010-02-15 18:50:03.000000000 +0100
+++ imagefield_avatarNew/imagefield_avatar.admin.inc	2011-04-20 15:54:57.673676608 +0200
@@ -21,30 +21,78 @@ function _imagefield_avatar_form_alter(&
       break;
 
     case 'user_profile_form':
+    case 'profile_node_form':
       unset($form['picture']);
       break;
 
     case 'user_admin_settings':
-      module_load_include('inc', 'hs_field_selector');
       $form['#submit'][] = '_imagefield_avatar_user_admin_settings_submit';
-      $form['#validate'][] = '_imagefield_avatar_user_admin_settings_validate';
-      $form['pictures']['settings']['user_picture_imagefield'] = hs_field_selector_form_element();
-      $form['pictures']['settings']['user_picture_imagefield']['#weight'] = -10;
-      $form['pictures']['settings']['user_picture_imagefield']['#required'] = TRUE;
-      $form['pictures']['settings']['user_picture_imagefield']['#title'] = t('Picture field');
-      $form['pictures']['settings']['user_picture_imagefield']['#description'] = t('Please select imagefield/filefield from a content type to serve as user picture (avatar). If the content type list is empty you need to add an imagefield to some content type first.');
-      $form['pictures']['settings']['user_picture_imagefield']['#default_value'] = array(
-        0 => variable_get('imagefield_avatar_content_type', ''),
-        1 => variable_get('imagefield_avatar_field', ''),
-      );
-      $form['pictures']['settings']['user_picture_imagefield']['#config']['special_items'] = array(
-        '' => array('none', 'exclusive')
-      );
-      $form['pictures']['settings']['user_picture_imagefield']['#config']['level_labels']['status'] = 0;
-      $form['pictures']['settings']['user_picture_imagefield']['#config']['params'] = array(
-        'field_filter' => '_imagefield_avatar_field_filter',
-        'nodetype_filter' => '_imagefield_avatar_nodetype_filter',
-      );
+      $form['#validate'][] = '_imagefield_avatar_user_admin_settings_validate';      
+
+      if(module_exists('hs_field_selector')) {
+          module_load_include('inc', 'hs_field_selector');
+          $form['pictures']['settings']['user_picture_imagefield'] = hs_field_selector_form_element();
+          $form['pictures']['settings']['user_picture_imagefield']['#weight'] = -10;
+          $form['pictures']['settings']['user_picture_imagefield']['#required'] = TRUE;
+          $form['pictures']['settings']['user_picture_imagefield']['#title'] = t('Picture field');
+          $form['pictures']['settings']['user_picture_imagefield']['#description'] = t('Please select imagefield/filefield from a content type to serve as user picture (avatar). If the content type list is empty you need to add an imagefield to some content type first.');
+          $form['pictures']['settings']['user_picture_imagefield']['#default_value'] = array(
+            0 => variable_get('imagefield_avatar_content_type', ''),
+            1 => variable_get('imagefield_avatar_field', ''),
+          );
+          $form['pictures']['settings']['user_picture_imagefield']['#config']['special_items'] = array(
+            '' => array('none', 'exclusive')
+          );
+          $form['pictures']['settings']['user_picture_imagefield']['#config']['level_labels']['status'] = 0;
+          $form['pictures']['settings']['user_picture_imagefield']['#config']['params'] = array(
+            'field_filter' => '_imagefield_avatar_field_filter',
+            'nodetype_filter' => '_imagefield_avatar_nodetype_filter',
+          );
+          $form['pictures']['settings']['user_picture_imagefield']['#config']['preset'] = array(
+            'field_filter' => '_imagefield_avatar_field_filter',
+            'nodetype_filter' => '_imagefield_avatar_nodetype_filter',
+          );      
+      } else {
+        $aTmpContentTypesOption = content_types();
+        $aFileFieldOption = array();
+        $aContentTypesOption = array();
+        
+        foreach($aTmpContentTypesOption as $aContentType) {
+            
+            foreach ($aContentType['fields'] as $key => $field) {
+                
+                if ($field['type'] == 'filefield') {
+                    $aContentTypesOption[$aContentType['type']] = $aContentType['type'];
+                    $aFileFieldOption[$field['field_name']] = $field['widget']['label'];
+                }
+
+            }
+
+        }
+        
+        $form['pictures']['settings']['avatarfilefield'] = array(
+            '#type' => 'fieldset',
+            '#title' => t('Select the FileField and the associated Cintent Type for the avatar, if you want a better widget install <a href="http://drupal.org/project/hs_field_selector" target="_blank">Hierarchical Select Field Selector</a> module'),
+            '#tree' => TRUE,
+        );
+        
+        $form['pictures']['settings']['avatarfilefield']['imagefield_avatar_content_type'] = array(
+            '#type' => 'select',
+            '#title' => t('Select the content type'),
+            '#default_value' => variable_get('imagefield_avatar_content_type', ''),
+            '#options' => $aContentTypesOption,
+            '#description' => t('Select the avatar content type'),
+        );
+        
+        $form['pictures']['settings']['avatarfilefield']['imagefield_avatar_field'] = array(
+            '#type' => 'select',
+            '#title' => t('Select the field'),
+            '#default_value' => variable_get('imagefield_avatar_field', ''),
+            '#options' => $aFileFieldOption,
+            '#description' => t('Select the avatar field'),
+        );
+      }
+      
       $form['pictures']['settings']['user_picture_path']['#type'] = 'hidden';
       $form['pictures']['settings']['user_picture_default']['#type'] = 'hidden';
       $form['pictures']['settings']['user_picture_dimensions']['#type'] = 'hidden';
@@ -56,8 +104,14 @@ function _imagefield_avatar_form_alter(&
 
 
 function _imagefield_avatar_user_admin_settings_submit($form, &$form_state) {
-  $type = $form_state['values']['user_picture_imagefield'][0];
-  $field = $form_state['values']['user_picture_imagefield'][1];
+  if(module_exists('hs_field_selector')) {
+    $type = $form_state['values']['user_picture_imagefield'][0];
+    $field = $form_state['values']['user_picture_imagefield'][1];
+  } else {
+    $type = $form_state['values']['avatarfilefield']['imagefield_avatar_content_type'];
+    $field = $form_state['values']['avatarfilefield']['imagefield_avatar_field'];
+  }
+
   variable_set('imagefield_avatar_content_type', $type);
   variable_set('imagefield_avatar_field', $field);
   // Update default user picture setting.
@@ -72,7 +126,15 @@ function _imagefield_avatar_user_admin_s
 }
 
 function _imagefield_avatar_user_admin_settings_validate ($form, &$form_state) {
-  if (!_nodetype_field_valid($form_state['values']['user_picture_imagefield'][0], $form_state['values']['user_picture_imagefield'][1])) {
+  if(module_exists('hs_field_selector')) {
+    $type = $form_state['values']['user_picture_imagefield'][0];
+    $field = $form_state['values']['user_picture_imagefield'][1];
+  } else {
+    $type = $form_state['values']['avatarfilefield']['imagefield_avatar_content_type'];
+    $field = $form_state['values']['avatarfilefield']['imagefield_avatar_field'];
+  }
+
+  if (!_nodetype_field_valid($type, $field)) {
     form_set_error('user_picture_imagefield', t('Illegal selection detected.'));
   }
 }
diff -up imagefield_avatar/imagefield_avatar.info imagefield_avatarNew/imagefield_avatar.info
--- imagefield_avatar/imagefield_avatar.info	2010-05-27 16:25:08.000000000 +0200
+++ imagefield_avatarNew/imagefield_avatar.info	2011-04-20 15:53:40.201678770 +0200
@@ -3,11 +3,11 @@ name = ImageField Avatar
 description = Use imagefield/filefield for user pictures.
 package = CCK
 dependencies[] = imagefield
-dependencies[] = hs_field_selector
-core = 6.x
-; Information added by drupal.org packaging script on 2010-05-27
-version = "6.x-1.1"
-core = "6.x"
-project = "imagefield_avatar"
-datestamp = "1274970308"
-
+;dependencies[] = hs_field_selector
+core = 6.x
+; Information added by drupal.org packaging script on 2010-05-27
+version = "6.x-1.1"
+core = "6.x"
+project = "imagefield_avatar"
+datestamp = "1274970308"
+
diff -up imagefield_avatar/imagefield_avatar.module imagefield_avatarNew/imagefield_avatar.module
--- imagefield_avatar/imagefield_avatar.module	2010-05-27 16:20:38.000000000 +0200
+++ imagefield_avatarNew/imagefield_avatar.module	2011-04-20 15:53:21.737679171 +0200
@@ -42,6 +42,7 @@ function imagefield_avatar_form_alter(&$
   switch ($form_id) {
     case 'content_field_edit_form':
     case 'user_profile_form':
+    case 'profile_node_form':
     case 'user_admin_settings':
       module_load_include('inc', 'imagefield_avatar', 'imagefield_avatar.admin');
       _imagefield_avatar_form_alter($form, $form_state, $form_id);
