diff --git a/og_invite_people.module b/og_invite_people.module
index 197b1ee..3821aed 100644
--- a/og_invite_people.module
+++ b/og_invite_people.module
@@ -2,7 +2,7 @@
 /**
  * @file
  * OG Invite People
- * 
+ *
  * OG 7.x-2.x required
  */
 
@@ -92,9 +92,9 @@ function _og_invite_people_new_users_form($form, &$form_state, $group_type, $gid
     '#title' => t('Invite a new user 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('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(
@@ -135,8 +135,8 @@ 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)) {
       form_set_error('invitee', t('Invalid email(s).'));
@@ -145,6 +145,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;
 }
 
 /**
@@ -153,8 +154,8 @@ 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']));
-  $state = $form_state['values']['state'];  
+  $invitee_emails = $form_state['invitee_emails'];
+  $state = $form_state['values']['state'];
   $field_name = $form_state['field_name'];
 
   // Add group membership form.
@@ -171,10 +172,10 @@ function _og_invite_people_new_users_form_submit($form, &$form_state) {
     $og_membership->etid = $account->uid;
     $og_membership->state = $state;
     $og_membership->save();
-    
+
     // Offer invitee user account object in form_state.
     $form_state['account'][] = $account;
-  
+
     // Invoke hook_og_invite_people_invited() - after a user is created and added to group.
     module_invoke_all('og_invite_people_invited', $account, $og_membership);
 
@@ -189,11 +190,11 @@ function _og_invite_people_new_users_form_submit($form, &$form_state) {
 function _og_invite_people_create_user($invitee_email) {
   // This will generate a random password.
   $password = user_password(8);
-  
+
   // Username from email.
   $name = explode('@', $invitee_email);
   $name = $name[0];
-  
+
   // Check if user name is available and append _NUM if existing.
   if (user_load_by_name($name)) {
     $i = 1;
@@ -204,7 +205,7 @@ function _og_invite_people_create_user($invitee_email) {
     }
     $name = $new_name;
   }
- 
+
   // Set up the user fields.
   $fields = array(
     'name' => $name,
@@ -216,10 +217,10 @@ function _og_invite_people_create_user($invitee_email) {
       DRUPAL_AUTHENTICATED_RID => 'authenticated user',
     ),
   );
-  
+
   // Create new user function.
   $account = user_save('', $fields);
- 
+
   // Send the e-mail through the user module.
   drupal_mail('user', 'register_no_approval_required', $invitee_email, NULL, array('account' => $account), variable_get('site_mail', NULL));