### Eclipse Workspace Patch 1.0
#P user
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.18.2.2
diff -u -p -r1.18.2.2 user.admin.inc
--- modules/user/user.admin.inc	1 Mar 2010 11:15:38 -0000	1.18.2.2
+++ modules/user/user.admin.inc	21 Sep 2010 22:32:24 -0000
@@ -240,8 +240,9 @@
 function user_admin_settings() {
   // User registration settings.
   $form['registration'] = array('#type' => 'fieldset', '#title' => t('User registration settings'));
-  $form['registration']['user_register'] = array('#type' => 'radios', '#title' => t('Public registrations'), '#default_value' => variable_get('user_register', 1), '#options' => array(t('Only site administrators can create new user accounts.'), t('Visitors can create accounts and no administrator approval is required.'), t('Visitors can create accounts but administrator approval is required.')));
-  $form['registration']['user_email_verification'] = array('#type' => 'checkbox', '#title' => t('Require e-mail verification when a visitor creates an account'), '#default_value' => variable_get('user_email_verification', TRUE), '#description' => t('If this box is checked, new users will be required to validate their e-mail address prior to logging into the site, and will be assigned a system-generated password. With it unchecked, users will be logged in immediately upon registering, and may select their own passwords during registration.'));
+  $form['registration']['user_register'] = array('#type' => 'radios', '#title' => t('Public registrations'), '#default_value' => variable_get('user_register', 0), '#options' => array(t('Only site administrators can create new user accounts.'), t('Visitors can create accounts and no administrator approval is required.'), t('Visitors can create accounts but administrator approval is required.')));
+  $form['registration']['user_email_verification'] = array('#type' => 'radios', '#title' => t('Require e-mail verification when a visitor creates an account'),'#default_value' => variable_get('user_email_verification', 0), '#options' => array(t('New users will be required to validate their e-mail address prior to logging into the site. A password will be randomly genarated.'), t('New users will be required to validate their e-mail address prior to logging into the site. Users will be logged in immediately upon registering, and may select their own passwords during registration.'),t('No e-mail validation')));
+  //$form['registration']['user_email_verification_pass'] = array('#type' => 'checkbox', '#title' => t('Require e-mail verification only'), '#default_value' => variable_get('user_email_verification_np', TRUE), '#description' => t('If this box is checked, new users will be required to validate their e-mail address prior to logging into the site. Users will be logged in immediately upon registering, and may select their own passwords during registration.'));
   $form['registration']['user_registration_help'] = array('#type' => 'textarea', '#title' => t('User registration guidelines'), '#default_value' => variable_get('user_registration_help', ''), '#description' => t('This text is displayed at the top of the user registration form and is useful for helping or instructing your users.'));
 
   // User e-mail settings.
Index: user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.892.2.27
diff -u -p -r1.892.2.27 user.module
--- modules/user/user.module	6 Aug 2010 11:58:09 -0000	1.892.2.27
+++ modules/user/user.module	21 Sep 2010 22:32:24 -0000
@@ -1503,7 +1503,7 @@
       '#size' => 25,
     );
   }
-  elseif (!variable_get('user_email_verification', TRUE) || $admin) {
+  elseif (!variable_get('user_email_verification', 0) || $admin) {
     $form['account']['pass'] = array(
       '#type' => 'password_confirm',
       '#description' => t('Provide a password for the new account in both fields.'),
@@ -2332,7 +2332,7 @@
 
   $mail = $form_state['values']['mail'];
   $name = $form_state['values']['name'];
-  if (!variable_get('user_email_verification', TRUE) || $admin) {
+  if (!variable_get('user_email_verification', 0) || $admin) {
     $pass = $form_state['values']['pass'];
   }
   else {
@@ -2376,7 +2376,7 @@
   // The first user may login immediately, and receives a customized welcome e-mail.
   if ($account->uid == 1) {
     drupal_set_message(t('Welcome to Drupal. You are now logged in as user #1, which gives you full control over your website.'));
-    if (variable_get('user_email_verification', TRUE)) {
+    if (variable_get('user_email_verification', 0)) {
       drupal_set_message(t('</p><p> Your password is <strong>%pass</strong>. You may change your password below.</p>', array('%pass' => $pass)));
     }
 
@@ -2391,7 +2391,7 @@
     if ($admin && !$notify) {
       drupal_set_message(t('Created a new user account for <a href="@url">%name</a>. No e-mail has been sent.', array('@url' => url("user/$account->uid"), '%name' => $account->name)));
     }
-    else if (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) {
+    else if (!variable_get('user_email_verification', 0) && $account->status && !$admin) {
       // No e-mail verification is required, create new user account, and login
       // user immediately.
       _user_mail_notify('register_no_approval_required', $account);