Index: supported/user_import.inc
===================================================================
--- supported/user_import.inc	(revision 2278)
+++ supported/user_import.inc	(working copy)
@@ -73,6 +73,7 @@
     'body'         => $body,
     'email_format' => $format,
     'css'          => $css,
+    'user'         => user_load($account->uid),
   );
 
   _user_import_publication_email($params, $account, $subscribed, $format);
@@ -104,10 +105,14 @@
  */
 function user_import_mail($key, &$message, $params) {
 
+  // Pop user object from $params. This will be fed straight into token_replace
+  // as a last call in _user_mail_text.
+  $user = array_pop($params);
+
   switch ($key) {
     case 'welcome':
-      $message['subject'] = (empty($params['subject'])) ? _user_mail_text('register_admin_created_subject', $message['language'], $params) : strtr($params['subject'], $params);
-      $body               = (empty($params['body'])) ? _user_mail_text('register_admin_created_body', $message['language'], $params) : strtr($params['body'], $params);
+      $message['subject'] = (empty($params['subject'])) ? _user_mail_text('register_admin_created_subject', $message['language'], array('user' => $user)) : strtr($params['subject'], $params);
+      $body               = (empty($params['body'])) ? _user_mail_text('register_admin_created_body', $message['language'], array('user' => $user)) : strtr($params['body'], $params);
 
       if ($params['email_format'] == 1) {
         $message['headers']['Content-Type'] = 'text/html; charset=UTF-8';
@@ -342,7 +347,15 @@
  */
 function user_import_send_email_subject_validate($element, &$form_state) {
   if (!empty($form_state['values']['send_email']) && empty($form_state['values']['subject'])) {
-    form_error($element, t('If Send Email has been enabled then an <strong>email subject</strong> line must set.'));
+
+    // Get default admin set up account message.
+    if (!variable_get('user_mail_register_admin_created_subject')) {
+      form_error($element, t('If Send Email has been enabled then an <strong>email subject</strong> line must set or the <strong>Welcome (new user created by administrator)</strong> subject should be set.'));
+    }
+    else {
+      $form_state['values']['subject'] = '';
+    }
+
   }
 }
 
@@ -351,7 +364,13 @@
  */
 function user_import_send_email_message_validate($element, &$form_state) {
   if (!empty($form_state['values']['send_email']) && empty($form_state['values']['message'])) {
-    form_error($element, t('If Send Email has been enabled then an <strong>email message</strong> must set.'));
+
+    if (!variable_get('user_mail_register_admin_created_body')) {
+      form_error($element, t('If Send Email has been enabled then an <strong>email message</strong> must set or the <strong>Welcome (new user created by administrator)</strong> body should be set.'));
+    }
+    else {
+      $form_state['values']['message'] = '';
+    }
   }
 }