Index: logintoboggan.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/logintoboggan/logintoboggan.module,v
retrieving revision 1.83.2.37
diff -u -F^f -u -F^f -r1.83.2.37 logintoboggan.module
--- logintoboggan.module	20 Apr 2008 17:17:06 -0000	1.83.2.37
+++ logintoboggan.module	21 Apr 2008 19:16:37 -0000
@@ -472,7 +472,7 @@ function logintoboggan_menu($may_cache) 
       'title' => t('Re-send validation e-mail'),
       'callback' => 'logintoboggan_resend_validation',
       'callback arguments' => array(arg(2)),
-      'access' => $user->uid == arg(2),
+      'access' => $user->uid == arg(2) || user_access('administer users'),
       'type' => MENU_CALLBACK,
       );
   }
@@ -888,8 +888,9 @@ function logintoboggan_eml_rehash($passw
  */
 function logintoboggan_user($op, &$edit, &$user_edit, $category = NULL) {
   global $user;
-  if ($op == 'form' && $category == 'account' && $user->uid == arg(1)) {
-    // User is editing their own account settings
+  if ($op == 'form' && $category == 'account' && ($user->uid == $user_edit->uid || user_access('administer users'))) {
+    // User is editing their own account settings, or user admin
+    // is editing their account.
     if (!variable_get('user_email_verification', TRUE) && array_key_exists(logintoboggan_validating_id(), $user_edit->roles) && variable_get('user_register', 1) == 1) {
       // User is still in pre-authorized role; display link to re-send e-mail.
       $form['revalidate'] = array(
@@ -944,8 +945,14 @@ function logintoboggan_resend_validation
   $body = _user_mail_text('welcome_body', $variables);
   drupal_mail('logintoboggan-resend-validation', $account->mail, $subject, $body, $from);
 
-  // Notify user that e-mail was sent and return to user edit form.
-  drupal_set_message(t('A validation e-mail has been sent to your e-mail address. You will need to follow the instructions in that message in order to gain full access to the site.'));
+  // Notify admin or user that e-mail was sent and return to user edit form.
+  if (user_access('administer users')) {
+    drupal_set_message(t("A validation e-mail has been sent to the user's e-mail address."));
+  }
+  else {
+    drupal_set_message(t('A validation e-mail has been sent to your e-mail address. You will need to follow the instructions in that message in order to gain full access to the site.'));
+  }
+
   drupal_goto('user/'. $account->uid .'/edit');
 }