Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.966
diff -u -p -r1.966 user.module
--- modules/user/user.module	26 Feb 2009 07:30:29 -0000	1.966
+++ modules/user/user.module	5 Mar 2009 17:01:58 -0000
@@ -377,7 +377,7 @@ function user_save($account, $edit = arr
     $user = user_load(array('uid' => $account->uid));
 
     // Send emails after we have the new user object.
-    if (isset($edit['status']) && $edit['status'] != $account->status) {
+    if (isset($edit['status']) && $edit['status'] != $account->status || $edit['resend'] == 1) {
       // The user's status is changing; conditionally send notification email.
       $op = $edit['status'] == 1 ? 'status_activated' : 'status_blocked';
       _user_mail_notify($op, $user);
@@ -1703,6 +1703,12 @@ function user_edit_form(&$form_state, $u
       '#default_value' => isset($edit['status']) ? $edit['status'] : 1,
       '#options' => array(t('Blocked'), t('Active'))
     );
+    if ($edit) {
+      $form['account']['resend'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Re-send welcome e-mail'),
+      );
+    }
   }
   if (user_access('administer permissions')) {
     $roles = user_roles(TRUE);