Index: genpass.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/genpass/genpass.module,v
retrieving revision 1.1
diff -u -r1.1 genpass.module
--- genpass.module	20 Aug 2008 02:56:36 -0000	1.1
+++ genpass.module	9 Sep 2008 16:14:11 -0000
@@ -7,29 +7,32 @@
   if ($form_id == 'user_register') {
     if ($form['pass']) {
       $form['pass']['#required'] = FALSE;
-      $form['#validate']["genpass_register_validate"] = array();
+      $form['#validate'][] = 'genpass_register_validate';
     } 
     else if ($form['account']['pass']) {
       $form['account']['pass']['#required'] = FALSE;
-      $form['#validate']["genpass_register_validate2"] = array();
+      $form['#validate'][] = 'genpass_register_validate2';
     }
   }
 }
 
-function genpass_register_validate(&$form, $form_state, $form_id) {
-//  drupal_set_message("genpass_register_validate: " . print_r($form_values, true));
+
+function genpass_register_validate($form, &$form_state) {
   if ($form_state['values']['pass'] == '') {
     $pass = user_password();
-    form_set_value($form['pass'], $pass);
+    form_set_value($form['pass'], $pass, $form_state);
     drupal_set_message("Generated password");
   }
+  return $form;
 }
 
-function genpass_register_validate2(&$form, $form_state, $form_id) {
-//  drupal_set_message("genpass_register_validate: " . print_r($form_values, true));
+
+function genpass_register_validate2($form, &$form_state) {
   if ($form_state['values']['account']['pass'] == '') {
     $pass = user_password();
-    form_set_value($form['account']['pass'], $pass);
+    form_set_value($form['account']['pass'], $pass, $form_state);
     drupal_set_message( "Generated password.");
+
   }
+  return $form;
 }