--- D:\drupal\bio\bio.module	2009-09-28 23:02:30.000000000 -0300
+++ C:\drupal\bio\bio.module	2009-09-28 22:54:45.000000000 -0300
@@ -137,22 +137,19 @@
         $cck_field = $function('prepare form values', $node, $field, $node_field);
         $cck_field = $function('form', $node, $field, $node_field);
         $form['bio_info'][] = $cck_field;
       }
     }
 
-    // Add custom validate handler. 
-    $form['#validate']['bio_user_register_validate'] = array();
   }
   return $form;
 }
 
 /**
  * Validate handler for user registration form. Validate CCK fields.
  */
-function bio_user_register_validate($form_id, $form_values) {
+function bio_user_register_validate($form_values) {
   // Create a dummy node to pass along to CCK.
   $node = new stdClass();
   $node->type = bio_get_type();
   foreach ($form_values as $field_name => $value) {
     if (preg_match('/^field_/', $field_name)) {
       $node->$field_name = $form_values[$field_name];
@@ -264,13 +261,13 @@
 
 /**
  * Implementation hook_user().
  */
 function bio_user($op, &$edit, &$account, $category = NULL) {
   // If there's no bio for this user, nothing to do here.
-  if ($op != 'register' &&  $op != 'insert' && !$nid = bio_for_user($account->uid)) {
+  if ($op != 'register' &&  $op != 'validate' && $op != 'insert' && !$nid = bio_for_user($account->uid)) {
     return;
   }
 
   switch ($op) {
     case 'view':
       // Add bio to main user profile page, if option is enabled and bio is accessible.
@@ -300,12 +297,16 @@
       // marked as such.
       return bio_user_register_form();
       break;
 
     case 'insert':
       return bio_user_register_submit($edit);
+      break;
 
+    case 'validate':
+      bio_user_register_validate($edit);
       break;
   }
 }
 
 /**
  * Implementation of hook_link().