diff --git a/api/user.go b/api/user.go
index daa405ad4e..a33e2f7d7d 100644
--- a/api/user.go
+++ b/api/user.go
@@ -2156,7 +2156,7 @@ func emailToLdap(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	go sendSignInChangeEmail(c, user.Email, c.GetSiteURL(), "LDAP")
+	go sendSignInChangeEmail(c, user.Email, c.GetSiteURL(), "AD/LDAP")
 
 	m := map[string]string{}
 	m["follow_link"] = "/login?extra=signin_change"
diff --git a/i18n/en.json b/i18n/en.json
index de69a0b29d..74a227f91e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2461,7 +2461,7 @@
   },
   {
     "id": "ent.ldap.disabled.app_error",
-    "translation": "LDAP disabled or licence does not support LDAP."
+    "translation": "AD/LDAP disabled or licence does not support AD/LDAP."
   },
   {
     "id": "ent.ldap.do_login.bind_admin_user.app_error",
diff --git a/webapp/components/admin_console/ldap_test_button.jsx b/webapp/components/admin_console/ldap_test_button.jsx
index 082c13b1b7..16a433c23b 100644
--- a/webapp/components/admin_console/ldap_test_button.jsx
+++ b/webapp/components/admin_console/ldap_test_button.jsx
@@ -71,7 +71,7 @@ export default class LdapTestButton extends React.Component {
                         <i className='fa fa-warning'/>
                         <FormattedMessage
                             id='admin.ldap.testFailure'
-                            defaultMessage='LDAP Test Failure: {error}'
+                            defaultMessage='AD/LDAP Test Failure: {error}'
                             values={{
                                 error: this.state.fail
                             }}
@@ -86,7 +86,7 @@ export default class LdapTestButton extends React.Component {
                         <i className='fa fa-success'/>
                         <FormattedMessage
                             id='admin.ldap.testSuccess'
-                            defaultMessage='LDAP Test Successful'
+                            defaultMessage='AD/LDAP Test Successful'
                             values={{
                                 error: this.state.fail
                             }}
@@ -99,7 +99,7 @@ export default class LdapTestButton extends React.Component {
         let helpText = (
             <FormattedHTMLMessage
                 id='admin.ldap.testHelpText'
-                defaultMessage='Tests if the Mattermost server can connect to the LDAP server specified. See log file for more detailed error messages.'
+                defaultMessage='Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.'
             />
         );
 
@@ -115,7 +115,7 @@ export default class LdapTestButton extends React.Component {
             contents = (
                 <FormattedMessage
                     id='admin.ldap.ldap_test_button'
-                    defaultMessage='LDAP Test'
+                    defaultMessage='AD/LDAP Test'
                 />
             );
         }
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index e50c709f00..a90d2949ad 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -417,7 +417,7 @@
   "admin.ldap.loginNameEx": "Ex \"AD/LDAP Username\"",
   "admin.ldap.loginNameTitle": "Login Field Name:",
   "admin.ldap.maxPageSizeEx": "Ex \"2000\"",
-  "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the LDAP server at one time. 0 is unlimited.",
+  "admin.ldap.maxPageSizeHelpText": "The maximum number of users the Mattermost server will request from the AD/LDAP server at one time. 0 is unlimited.",
   "admin.ldap.maxPageSizeTitle": "Maximum Page Size:",
   "admin.ldap.nicknameAttrDesc": "(Optional) The attribute in the AD/LDAP server that will be used to populate the nickname of users in Mattermost.",
   "admin.ldap.nicknameAttrEx": "Ex \"nickname\"",
@@ -440,7 +440,9 @@
   "admin.ldap.syncNowHelpText": "Initiates an AD/LDAP synchronization immediately.",
   "admin.ldap.sync_button": "AD/LDAP Synchronize Now",
   "admin.ldap.testFailure": "AD/LDAP Test Failure: {error}",
+  "admin.ldap.testSuccess": "AD/LDAP Test Successful",
   "admin.ldap.testHelpText": "Tests if the Mattermost server can connect to the AD/LDAP server specified. See log file for more detailed error messages.",
+  "admin.ldap.ldap_test_button": "AD/LDAP Test",
   "admin.ldap.uernameAttrDesc": "The attribute in the AD/LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.",
   "admin.ldap.userFilterDisc": "(Optional) Enter an AD/LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).",
   "admin.ldap.userFilterEx": "Ex. \"(objectClass=user)\"",