diff --git a/supported/user_import.inc b/supported/user_import.inc
index d68824e..fc26d0b 100644
--- a/supported/user_import.inc
+++ b/supported/user_import.inc
@@ -313,7 +313,13 @@ function user_import_template_unique_name_validate($form, &$form_state) {
  */
 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'] = '';
+    }
   }
 }
 
@@ -322,7 +328,12 @@ function user_import_send_email_subject_validate($element, &$form_state) {
  */
 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'] = '';
+    }
   }
 }
 
diff --git a/user_import.module b/user_import.module
index 582c3ef..c7adcfe 100644
--- a/user_import.module
+++ b/user_import.module
@@ -871,6 +871,9 @@ function _user_import_file_deletion($filepath, $filename, $old_filename, $ftp, $
  */
 function user_import_mail($key, &$message, $params) {
 
+  $user = user_load($params['!uid']);
+  $params['user'] = $user;
+
   switch ($key) {
     case 'welcome':
       $message['subject'] = (empty($params['subject'])) ? _user_mail_text('register_admin_created_subject', $message['language'], $params) : strtr($params['subject'], $params);