diff --git a/lib/global-admin/addon/security/authentication/azuread/controller.js b/lib/global-admin/addon/security/authentication/azuread/controller.js
index c5e2c43e8..2e2d60c1a 100644
--- a/lib/global-admin/addon/security/authentication/azuread/controller.js
+++ b/lib/global-admin/addon/security/authentication/azuread/controller.js
@@ -158,12 +158,8 @@ export default Controller.extend({
 
       setProperties(model, {
         enabled:  false,
-        username: null,
-        password: null,
       });
 
-      // model.save().then(() => {
-
       model.doAction('disable').then(() => {
 
         this.send('waitAndRefresh');
diff --git a/lib/global-admin/addon/security/authentication/controller.js b/lib/global-admin/addon/security/authentication/controller.js
index dce01fc44..c516651c4 100644
--- a/lib/global-admin/addon/security/authentication/controller.js
+++ b/lib/global-admin/addon/security/authentication/controller.js
@@ -10,9 +10,8 @@ export default Controller.extend({
   drivers: computed(function() {
     return [
       {route: 'security.authentication.activedirectory', label: 'Active Directory',  css: 'activedirectory', available: this.hasRecord('activedirectoryconfig')  },
-      {route: 'security.authentication.azuread',         label: 'Azure AD',          css: 'azuread',         available: this.hasRecord('azureadconfig')  },
+      // {route: 'security.authentication.azuread',         label: 'Azure AD',          css: 'azuread',         available: this.hasRecord('azureadconfig')  },
       {route: 'security.authentication.github',          label: 'GitHub',            css: 'github',          available: this.hasRecord('githubconfig')  },
-      // {route: 'security.authentication.localauth',       label: 'Local',             css: 'local',           available: this.hasRecord('localconfig')  }, // always on
       // {route: 'security.authentication.openldap',        label: 'OpenLDAP',          css: 'openldap',        available: this.hasRecord('openldapconfig')  },
       // {route: 'security.authentication.shibboleth',      label: 'Shibboleth',        css: 'shibboleth',      available: this.hasRecord('shibbolethconfig')  },
     ];