diff --git a/ldap_servers/LdapServerAdmin.class.php b/ldap_servers/LdapServerAdmin.class.php
index e5017d4..48bace6 100644
--- a/ldap_servers/LdapServerAdmin.class.php
+++ b/ldap_servers/LdapServerAdmin.class.php
@@ -199,18 +199,6 @@ class LdapServerAdmin extends LdapServer {
 
   public function drupalForm($op) {
 
-  //  $form['#validate'] = array('ldap_servers_admin_form_validate');
-    $form['#prefix'] = <<<EOF
-<p>Setup an LDAP server configuration to be used by other modules such as LDAP Authentication,
-LDAP Authorization, etc.</p>
-<p>More than one LDAP server configuration can exist for a physical LDAP server.
-Multiple configurations for the same physical ldap server are useful in cases such as: (1) different
-base dns for authentication and authorization and (2) service accounts with different privileges
-for different purposes.</p>
-EOF;
-
-  $form['#prefix'] = t($form['#prefix']);
-
   $form['server'] = array(
     '#type' => 'fieldset',
     '#title' => t('Connection settings'),
@@ -221,6 +209,7 @@ EOF;
   $form['bind_method'] = array(
     '#type' => 'fieldset',
     '#title' => t('Binding Method'),
+    '#description' => t('How the Drupal system is authenticated by the LDAP server.'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
@@ -657,21 +646,21 @@ public function drupalFormSubmit($op, $values) {
           '#type' => 'radios',
           '#title' => t('Binding Method for Searches (such as finding user object or their group memberships)'),
           '#options' => array(
-            LDAP_SERVERS_BIND_METHOD_SERVICE_ACCT => t('Service Account Bind.  Use credentials in following section to
-            bind to ldap.  This option is usually a best practice. Service account is entered in next section.'),
+            LDAP_SERVERS_BIND_METHOD_SERVICE_ACCT => t('Service Account Bind: Use credentials in the 
+            <strong>Service Account</strong> field to bind to LDAP.  <em>This option is usually a best practice.</em>'),
 
-            LDAP_SERVERS_BIND_METHOD_USER => t('Bind with Users Credentials.  Use users\' entered credentials
-            to bind to LDAP.  This is only useful for modules that work during user logon such
-            as ldap authentication and ldap authorization.  This option is not a best practice in most cases.
-            The users dn must be of the form "cn=[username],[base dn]" for this option to work.'),
+            LDAP_SERVERS_BIND_METHOD_USER => t('Bind with Users Credentials: Use user\'s entered credentials
+            to bind to LDAP.<br/> This is only useful for modules that execute during user logon such
+            as LDAP Authentication and LDAP Authorization.  <em>This option is not a best practice in most cases.</em>
+            The user\'s dn must be of the form "cn=[username],[base dn]" for this option to work.'),
 
-            LDAP_SERVERS_BIND_METHOD_ANON_USER => t('Anonymous Bind for search, then Bind with Users Credentials.
-            Searches for user DN then uses users\' entered credentials to bind to LDAP.  This is only useful for
-            modules that work during user logon such as ldap authentication and ldap authorization.
-            The users dn must be discovered by an anonymous search for this option to work.'),
+            LDAP_SERVERS_BIND_METHOD_ANON_USER => t('Anonymous Bind for search, then Bind with Users Credentials:
+            Searches for user dn then uses user\'s entered credentials to bind to LDAP.<br/> This is only useful for
+            modules that work during user logon such as LDAP Authentication and LDAP Authorization.
+            The user\'s dn must be discovered by an anonymous search for this option to work.'),
 
-            LDAP_SERVERS_BIND_METHOD_ANON => t('Anonymous Bind. Use no credentials to bind to ldap server.
-            Will not work on most ldaps.'),
+            LDAP_SERVERS_BIND_METHOD_ANON => t('Anonymous Bind: Use no credentials to bind to LDAP server.<br/>
+            <em>This option will not work on most LDAPS connections.</em>'),
           ),
         ),
         'schema' => array(
@@ -687,7 +676,7 @@ public function drupalFormSubmit($op, $values) {
         'fieldset' => 'bind_method',
         '#type' => 'markup',
         '#markup' => t('<label>Service Account</label> Some LDAP configurations
-          prohibit or restrict results of anonymous searches. These LDAPs require a DN//password pair
+          prohibit or restrict the results of anonymous searches. These LDAPs require a DN//password pair
           for binding. For security reasons, this pair should belong to an
           LDAP account with stripped down permissions.
           This is also required for provisioning LDAP accounts and groups!'),
@@ -735,7 +724,7 @@ public function drupalFormSubmit($op, $values) {
         'form' => array(
           'fieldset' => 'bind_method',
           '#type' => 'checkbox',
-          '#title' => t('Clear existing password from database.  Check this when switching away from service account binding.'),
+          '#title' => t('Clear existing password from database.  Check this when switching away from Service Account Binding.'),
           '#default_value' => 0,
         ),
       ),
diff --git a/ldap_servers/ldap_servers.module b/ldap_servers/ldap_servers.module
index 7bf6aab..0731bf9 100644
--- a/ldap_servers/ldap_servers.module
+++ b/ldap_servers/ldap_servers.module
@@ -759,23 +759,66 @@ function ldap_servers_php_supports_pagination() {
 
 function ldap_servers_help($path, $arg) {
 
-  $servers_help = t('LDAP Servers stores "LDAP server configurations" so other modules
-    can connect to them and leverage their data.  LDAP authentication and LDAP authorization
-    are two such modules.  Generally only one LDAP Server Configuration is needed.
-    When multiple LDAP server configurations are needed, each is not necessarily
-    a separate physical LDAP server; they may have different binding users or some
-    other configuration difference.',
-      array(
-        '!helplink' => l(LDAP_SERVERS_DRUPAL_HELP_URL, LDAP_SERVERS_DRUPAL_HELP_URL),
-      ));
-
+  $servers_help = '<p>' . t('LDAP Servers store "LDAP server configurations" so other modules can connect to them and leverage their data. ');
+  $servers_help .= t('LDAP Authentication and LDAP Authorization are two such modules. Generally, only one LDAP Server configuration is needed. ') . '</p>';
+  $servers_help .= '<p>' . t('When multiple LDAP server configurations are needed, each is not necessarily a separate physical LDAP server; they may have different binding users or some other configuration difference. ') . '</p>';
+  
   switch ($path) {
     case 'admin/config/people/ldap/servers':
-      $output = '<p>' . $servers_help . '</p>';
-      return $output;
+      return $servers_help;
 
     case 'admin/help#ldap_servers':
-      $output = '<p>' . $servers_help . '</p>';
+      $servers_help .= '<h3>' . t('Configuration - Settings') . '</h3>';
+      $servers_help .= '<dl>';
+      $servers_help .= '<dt>' . t('REQUIRE HTTPS ON CREDENTIAL PAGES') . '</dt>';
+      $servers_help .= '<dd>' . t('If checked, modules using LDAP will not allow credentials to be entered on or submitted to HTTP pages, only HTTPS. This option should be used with an approach to get all logon forms to be HTTPS.') . '</dd>';
+      $servers_help .= '<dt>' . t('ENCRYPTION') . '</dt>';
+      $servers_help .= '<dd>' . t('With encryption enabled, passwords will be stored in encrypted form. This is two way encryption because the actual password needs to used to bind to LDAP. So it offers minimal defense if someone gets in the filespace. It mainly helps avoid the accidental discovery of a clear text password.') . '</dd>';
+      $servers_help .= '<dt>' . t('LOG DETAILED LDAP ACTIONS') . '</dt>';
+      $servers_help .= '<dd>' . t('Enables LDAP logging to the Drupal Watchdog system') . '</dd>';
+      $servers_help .= '</dl>';
+      $servers_help .= '<h3>' . t('Configuration - Servers (List)') . '</h3>';
+      $servers_help .= '<dl>';
+      $servers_help .= '<dt>' . t('Configuration Table') . '</dt>';
+      $servers_help .= '<dd>' . t('Provides a list of currently stored LDAP server configuratins. ') . '</dd>';
+      $servers_help .= '<h3>' . t('Configuration - Servers (Add LDAP Server Configuration)') . '</h3>';
+      $servers_help .= '<dl>';
+      $servers_help .= '<dt>' . t('CONNECTION SETTINGS') . '</dt>';
+      $servers_help .= '<dd>' . t('Machine name - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Name - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Enabled - ') . '</dd>';
+      $servers_help .= '<dd>' . t('LDAP Server Type - ') . '</dd>';
+      $servers_help .= '<dd>' . t('LDAP Server - ') . '</dd>';
+      $servers_help .= '<dd>' . t('LDAP port - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Use Start-TLS - ') . '</dd>';
+      $servers_help .= '</dl>';
+      $servers_help .= '<dl>';
+      $servers_help .= '<dt>' . t('BINDING METHOD') . '</dt>';
+      $servers_help .= '<dd>' . t('Binding Method for searches - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Service Account - ') . '</dd>';
+      $servers_help .= '<dd>' . t('DN for non-anonymous search - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Password for non-anonymous search - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Clear existing password from database - ') . '</dd>';
+      $servers_help .= '</dl>';
+      $servers_help .= '<dl>';
+      $servers_help .= '<dt>' . t('LDAP USER TO DRUPAL USER RELATIONSHIP') . '</dt>';
+      $servers_help .= '<dd>' . t('Base DNs for LDAP Users, Groups, and Other Entries - ') . '</dd>';
+      $servers_help .= '<dd>' . t('AuthName Attribute - ') . '</dd>';
+      $servers_help .= '<dd>' . t('AccountName Attribute - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Email Attribute - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Email Template - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Persistant and Unique User ID Attribute - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Does PUID hold a binary value? - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Expression for User DN - ') . '</dd>';
+      $servers_help .= '<dd>' . t('PHP to Transform Drupal Login Username to LDAP UserName Attribute - ') . '</dd>';
+      $servers_help .= '<dd>' . t('Testing Drupal Username - ') . '</dd>';
+      $servers_help .= '<dd>' . t('DN of Testing Username - ') . '</dd>';
+      $servers_help .= '</dl>';
+      return $servers_help;
+
+    case 'admin/config/people/ldap/servers/add':
+      $output = '<p>' . t('Setup an LDAP server configuration to be used by other modules such as LDAP Authentication, LDAP Authorization, etc.') . '</p>';
+      $output .= '<p>' . t('More than one LDAP server configuration can exist for a physical LDAP server. Multiple configurations for the same physical ldap server are useful in cases such as: (1) different base dn\'s for authentication and authorization and (2) service accounts with different privileges for different purposes.') . '</p>';
       return $output;
   }
 }