diff --git a/og.css b/og.css
index fe18fa8..ed2af2e 100644
--- a/og.css
+++ b/og.css
@@ -55,3 +55,12 @@
   font-style: italic;
 }
 
+/* let the description appear in the correct position */
+#og-invite-form .container-inline .description, #og-add-users .container-inline .description {
+  float: left;
+}
+
+#og-invite-form .form-item label, #og-add-users .form-item label {
+  clear: left;
+}
+
diff --git a/og.module b/og.module
index 125a2a5..35bc161 100644
--- a/og.module
+++ b/og.module
@@ -24,6 +24,10 @@ define('OG_NOTIFICATION_NEVER', 0);
 define('OG_NOTIFICATION_ALWAYS', 1);
 define('OG_NOTIFICATION_SELECTIVE', 2);
 
+// og forms where username helper is shown
+define('OG_INVITE_FORM', 'og-invite-form');
+define('OG_ADD_USERS', 'og-add-users');
+
 function og_help($path, $arg) {
   if ($path) {
     switch ($path) {
@@ -163,6 +167,16 @@ function og_menu() {
       'weight' => 7
     );
 
+  // username helper autocomplete
+  $items['og/username_helper/autocomplete'] = array(
+    'title' => 'Autocomplete username',
+    'page callback' => 'user_autocomplete',
+    'access arguments' => array('access og username helper'),
+    'type' => MENU_CALLBACK,
+    'file' => 'user.pages.inc',
+    'file path' => drupal_get_path('module', 'user'),
+  );
+
   return $items;
 }
 
@@ -369,7 +383,7 @@ function og_set_language($node) {
  * Implementation of hook_perm().
  */
 function og_perm() {
-  return array('administer organic groups');
+  return array('administer organic groups', 'access og username helper');
 }
 
 /**
@@ -1675,6 +1689,28 @@ function og_form_alter(&$form, &$form_state, $form_id) {
       og_form_add_og_audience($form, $form_state);
     }
   }
+
+  // Add username helper
+  if ($form['#id'] == OG_INVITE_FORM || $form['#id'] == OG_ADD_USERS) {
+    drupal_add_js(drupal_get_path('module', 'og') .'/og_username_helper.js');
+    $form['og_username_helper_text'] = array(
+      '#type' => 'textfield',
+      '#description' => t('Lookup a username and add it to the list below.'),
+      '#autocomplete_path' => 'og/username_helper/autocomplete',
+      '#size' => 40,
+      '#maxlength' => 60,
+      '#weight' => -2,
+      '#prefix' => '<div class="container-inline">',
+    );
+    $form['og_username_helper_add_button'] = array(
+      '#type' => 'button',
+      '#value' => t('Add'),
+      '#button_type' => 'add',
+      '#weight' => -1,
+      '#suffix' => '</div>',
+    );
+  }
+
 }
 
 function og_form_node_type_form_alter(&$form, &$form_state) {
diff --git a/og_username_helper.js b/og_username_helper.js
new file mode 100644
index 0000000..08d5ba2
--- /dev/null
+++ b/og_username_helper.js
@@ -0,0 +1,23 @@
+/* Add usernames to the one of the fields supported */
+Drupal.og_username_helperAutoAttach = function() {
+  $("#edit-og-username-helper-add-button").click(function() {
+    if ( $("#edit-og-username-helper-text").val() != undefined ) {
+      var coma=',';
+      if ( $("#edit-mails").val() != undefined) {
+        if ( $("#edit-mails").val() == '')
+          coma='';
+        $("#edit-mails").val($("#edit-mails").val()+coma+$("#edit-og-username-helper-text").val());
+      } else if ( $("#edit-og-names").val() != undefined ) {
+        if ($("#edit-og-names").val()=='')
+          coma='';
+        $("#edit-og-names").val($("#edit-og-names").val()+coma+$("#edit-og-username-helper-text").val());
+      }
+      $("#edit-og-username-helper-text").val('');
+    }
+    return false;
+  });
+}
+
+if (Drupal.jsEnabled) {
+  $(document).ready(Drupal.og_username_helperAutoAttach);
+}
