diff --git a/include/i18n/en_US/help/tips/org.yaml b/include/i18n/en_US/help/tips/org.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0cb4219f5afe31dd8357efee506f35718b2c1ad4
--- /dev/null
+++ b/include/i18n/en_US/help/tips/org.yaml
@@ -0,0 +1,36 @@
+#
+# This is the view / management page for an organization in the user
+# directory
+#
+# Fields:
+# title - Shown in bold at the top of the popover window
+# content - The body of the help popover
+# links - List of links shows below the content
+#   title - Link title
+#   href - href of link (links starting with / are translated to the
+#       helpdesk installation path)
+#
+# The key names such as 'helpdesk_name' should not be translated as they
+# must match the HTML #ids put into the page template.
+#
+---
+org_sharing:
+    title: Ticket Sharing
+    content: >
+        <p>
+        Organization ticket sharing allows members access to tickets owned
+        by other members of the organization.
+        </p>
+        <p class="info-banner">
+        <i class="icon-info-sign"></i>
+        Collaborators always have access to tickets.
+        </p>
+
+email_domain:
+    title: Email Domain
+    content: >
+        Users can be automatically added to this organization based on their
+        email domain(s). Use the box below to enter one or more domains
+        separated by commas. For example, enter <code>mycompany.com</code>
+        for users with email addresses ending in @mycompany.com
+
diff --git a/include/staff/templates/org-profile.tmpl.php b/include/staff/templates/org-profile.tmpl.php
index d22ba8bb4156ac79acc984cad913da6982f879db..520c73ebfd2c6356fff050714aea0cb99222b163 100644
--- a/include/staff/templates/org-profile.tmpl.php
+++ b/include/staff/templates/org-profile.tmpl.php
@@ -20,7 +20,7 @@ if ($info['error']) {
         ><i class="icon-fixed-width icon-cogs faded"></i>&nbsp;<?php
         echo __('Settings'); ?></a></li>
 </ul>
-<form method="post" class="org" action="<?php echo $action; ?>">
+<form method="post" class="org" action="<?php echo $action; ?>" data-tip-namespace="org">
 <div id="orgprofile_container">
 <div class="tab_content" id="profile" style="margin:5px;">
 <?php
@@ -111,7 +111,7 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
                         <option value="sharing-all" <?php echo $info['sharing-all'] ? 'selected="selected"' : '';
                             ?>><?php echo __('All members see all tickets'); ?></option>
                     </select>
-                    <i class="help-tip icon-question-sign" href="#org-sharing"></i>
+                    <i class="help-tip icon-question-sign" href="#org_sharing"></i>
                 </td>
             </tr>
             <tr>
@@ -140,6 +140,7 @@ if ($ticket && $ticket->getOwnerId() == $user->getId())
             <tr>
                 <th colspan="2">
                     <?php echo __('Email Domain'); ?>
+                    <i class="help-tip icon-question-sign" href="#email_domain"></i>
                 </th>
             </tr>
             <tr>