diff --git a/og_invite_people.module b/og_invite_people.module
index e02c7ad..e0a7a77 100644
--- a/og_invite_people.module
+++ b/og_invite_people.module
@@ -89,12 +89,12 @@ function _og_invite_people_new_users_form($form, &$form_state, $group_type, $gid
 
   $form['og_invite_people'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Invite a new user to %group', array('%group' => $label)),
+    '#title' => t('Invite new users to %group', array('%group' => $label)),
   );
   $form['og_invite_people']['invitee'] = array(
-    '#type' => 'textfield',
+    '#type' => 'textarea',
     '#title' => t('User email(s)'),
-    '#description' => t('New user will be created and invited as a member to this group. One time login link is sent to invitee\'s email. (You can also invite multiple people at once. Simply enter their email addresses separated by commas.)'),
+    '#description' => t('Use commas or new lines to split email addresses. The new users will be created and invited as members of this group. A one time login link will be sent to the invitees\' email.  '),
     '#required' => TRUE,
   );
   $form['og_invite_people']['state'] = array(
@@ -127,7 +127,7 @@ function _og_invite_people_new_users_form($form, &$form_state, $group_type, $gid
   $form_state['field_name'] = $field_name;
 
   $form['actions'] = array('#type' => 'actions');
-  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Invite user'));
+  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Invite user(s)'));
 
   return $form;
 }
@@ -140,7 +140,7 @@ function _og_invite_people_new_users_form_validate($form, &$form_state) {
   //$account = user_load_by_name($form_state['values']['name']);
   $group_type = $form_state['values']['group_type'];
   $gid = $form_state['values']['gid'];
-  $invitee_emails = explode(',', preg_replace('/\s+/', '', $form_state['values']['invitee']));
+  $invitee_emails = preg_split('/\s*[,\n]\s*/', $form_state['values']['invitee']);
 
   foreach ($invitee_emails as $invitee_email) {
     if (!valid_email_address($invitee_email)) {
@@ -150,6 +150,7 @@ function _og_invite_people_new_users_form_validate($form, &$form_state) {
       form_set_error('invitee', t('User email already exists in the system.'));
     }
   }
+  $form_state['invitee_emails'] = $invitee_emails;
 }
 
 /**
@@ -158,7 +159,7 @@ function _og_invite_people_new_users_form_validate($form, &$form_state) {
 function _og_invite_people_new_users_form_submit($form, &$form_state) {
   $group_type = $form_state['values']['group_type'];
   $gid = $form_state['values']['gid'];
-  $invitee_emails = explode(',', preg_replace('/\s+/', '', $form_state['values']['invitee']));
+  $invitee_emails = $form_state['invitee_emails'];
   $state = $form_state['values']['state'];
   $field_name = $form_state['field_name'];