diff --git a/lib/global-admin/addon/security/authentication/activedirectory/route.js b/lib/global-admin/addon/security/authentication/activedirectory/route.js
index 42c7a4fe2..a6fda02e7 100644
--- a/lib/global-admin/addon/security/authentication/activedirectory/route.js
+++ b/lib/global-admin/addon/security/authentication/activedirectory/route.js
@@ -10,7 +10,14 @@ export default Route.extend({
     return hash({
       activeDirectory: gs.find('authconfig', 'activedirectory'),
       principals: gs.all('principal'),
-    })
+    }).then((hash) => {
+      let defaultAd = hash.activeDirectory;
+      let schema = get(this, 'globalStore').getById('schema','activedirectoryconfig');
+
+      schema.getLoadDefaults(defaultAd);
+
+      return hash;
+    });
   },
 
   setupController: function(controller, model) {
diff --git a/lib/global-admin/addon/templates/-ldap-config.hbs b/lib/global-admin/addon/templates/-ldap-config.hbs
index 7fce53aba..55ec0fd20 100644
--- a/lib/global-admin/addon/templates/-ldap-config.hbs
+++ b/lib/global-admin/addon/templates/-ldap-config.hbs
@@ -49,11 +49,11 @@
       </div>
       <div class="col span-4">
         <h3>{{t 'ldap.accessEnabled.users.header'}}</h3>
-        <div><b>{{t 'ldap.accessEnabled.general.searchBase'}} </b> <span class="text-muted">{{adConfig.domain}}</span></div>
+        <div><b>{{t 'ldap.accessEnabled.general.searchBase'}} </b> <span class="text-muted">{{adConfig.userSearchBase}}</span></div>
         <div><b>{{t 'ldap.accessEnabled.users.objectClass'}} </b> <span class="text-muted">{{adConfig.userObjectClass}}</span></div>
-        <div><b>{{t 'ldap.accessEnabled.users.login'}} </b> <span class="text-muted">{{adConfig.userLoginField}}</span></div>
-        <div><b>{{t 'ldap.accessEnabled.users.name'}} </b> <span class="text-muted">{{adConfig.userNameField}}</span></div>
-        <div><b>{{t 'ldap.accessEnabled.users.search'}} </b> <span class="text-muted">{{adConfig.userSearchField}}</span></div>
+        <div><b>{{t 'ldap.accessEnabled.users.login'}} </b> <span class="text-muted">{{adConfig.userLoginAttribute}}</span></div>
+        <div><b>{{t 'ldap.accessEnabled.users.name'}} </b> <span class="text-muted">{{adConfig.userNameAttribute}}</span></div>
+        <div><b>{{t 'ldap.accessEnabled.users.search'}} </b> <span class="text-muted">{{adConfig.userSearchAttribute}}</span></div>
         <div><b>{{t 'ldap.accessEnabled.users.enabled'}} </b> <span class="text-muted">{{adConfig.userEnabledAttribute}}</span></div>
         <div><b>{{t 'ldap.accessEnabled.users.disabledBitMask'}} </b> <span class="text-muted">{{adConfig.userDisabledBitMask}}</span></div>
       </div>
@@ -61,8 +61,8 @@
         <h3>{{t 'ldap.accessEnabled.group.header'}}</h3>
         <div><b>{{t 'ldap.accessEnabled.general.searchBase'}} </b> <span class="text-muted">{{adConfig.groupDomain}}</span></div>
         <div><b>{{t 'ldap.accessEnabled.group.objectClass'}} </b> <span class="text-muted">{{adConfig.groupObjectClass}}</span></div>
-        <div><b>{{t 'ldap.accessEnabled.group.name'}} </b> <span class="text-muted">{{adConfig.groupNameField}}</span></div>
-        <div><b>{{t 'ldap.accessEnabled.group.search'}} </b> <span class="text-muted">{{adConfig.groupSearchField}}</span></div>
+        <div><b>{{t 'ldap.accessEnabled.group.name'}} </b> <span class="text-muted">{{adConfig.groupNameAttribute}}</span></div>
+        <div><b>{{t 'ldap.accessEnabled.group.search'}} </b> <span class="text-muted">{{adConfig.groupSearchAttribute}}</span></div>
       </div>
     </div>
   </section>
@@ -125,13 +125,13 @@
       <div class="col span-6">
         <div class="inline-form">
           <label class="acc-label pb-5">{{t 'ldap.customizeSchema.users.searchBase.labelText'}}{{field-required}}</label>
-          {{input value=adConfig.userSearchBase classNames="form-control"}}
+          {{input value=adConfig.userSearchBase classNames="form-control" placeholder=(t 'ldap.accessConfig.userSearchBase.placeholder')}}
           <p class="help-block">{{t 'model.openldapconfig.domain.help'}}</p>
         </div>
       </div>
       <div class="col span-6">
         <div class="inline-form">
-          <label class="acc-label pb-5">{{t 'ldap.accessConfig.groupSearchBase.labelText'}}{{field-required}}</label>
+          <label class="acc-label pb-5">{{t 'ldap.accessConfig.groupSearchBase.labelText'}}</label>
           {{input value=adConfig.groupDomain classNames="form-control" placeholder=(t 'ldap.accessConfig.groupSearchBase.placeholder')}}
           <p class="help-block">{{t 'ldap.accessConfig.groupSearchBase.helpText'}}</p>
         </div>
@@ -200,11 +200,18 @@
       </div>
     </div>
     <div class="row">
-      <div class="col span-12">
-        <div class="pb-20">
+      <div class="col span-12 input-group mt-0">
+        <div class="clearfix">
           <label class="acc-label pb-5">{{t 'ldap.customizeSchema.cert.labelText'}}</label>
-          {{input value=adConfig.certificate classNames="form-control" placeholder=(t 'ldap.customizeSchema.groups.groupDN.placeholder')}}
         </div>
+        {{input-text-file
+            value=adConfig.certificate
+            canChangeName=false
+            accept="text/plain,.pem,.pkey,.key"
+            minHeight=60
+            placeholder="newCertificate.key.placeholder"
+            shouldChangeName=false
+        }}
       </div>
     </div>
   </section>
diff --git a/package.json b/package.json
index c7434b328..5d23dadc4 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "ansi_up": "^2.0.2",
     "broccoli-asset-rev": "^2.6.0",
     "dotenv": "^4.0.0",
-    "ember-api-store": "2.6.1",
+    "ember-api-store": "2.6.2",
     "ember-browserify": "^1.2.0",
     "ember-cli": "~2.16.2",
     "ember-cli-app-version": "^3.0.0",
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index ce38d0524..2d330babc 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -1478,6 +1478,9 @@ ldap:
       labelText: Group Search Base
       placeholder: "e.g. ou=Groups,dc=mycompany,dc=com"
       helpText: "If set, groups will be searched for only under this base instead of under the User Search Base."
+    userSearchBase:
+      labelText: User Search Base
+      placeholder: "e.g. ou=users,dc=mycompany,dc=com"
     defaultDomain:
       helpText: "This domain will be used if a user logs in without specifing one."
       labelText: Default Login Domain