diff --git a/app/extensions/oauth/components/oauth-providers-selector/oauth-provider-selector-controller.js b/app/extensions/oauth/components/oauth-providers-selector/oauth-provider-selector-controller.js
index 2f5be632a..b12549392 100644
--- a/app/extensions/oauth/components/oauth-providers-selector/oauth-provider-selector-controller.js
+++ b/app/extensions/oauth/components/oauth-providers-selector/oauth-provider-selector-controller.js
@@ -4,6 +4,9 @@ angular.module('portainer.extensions.oauth')
 
     this.providers = [
       {
+        authUrl: 'https://login.microsoftonline.com/TENANT_ID/oauth2/authorize',
+        accessTokenUrl: 'https://login.microsoftonline.com/TENANT_ID/oauth2/token',
+        resourceUrl: 'https://graph.windows.net/TENANT_ID/me?api-version=2013-11-08',
         userIdentifier: 'mail',
         scope: 'id,email,name',
         name: 'microsoft'
diff --git a/app/extensions/oauth/components/oauth-settings/oauth-settings-controller.js b/app/extensions/oauth/components/oauth-settings/oauth-settings-controller.js
index 58690b511..c5015b5e8 100644
--- a/app/extensions/oauth/components/oauth-settings/oauth-settings-controller.js
+++ b/app/extensions/oauth/components/oauth-settings/oauth-settings-controller.js
@@ -27,6 +27,10 @@ angular.module('portainer.extensions.oauth')
       ctrl.settings.ResourceURI = provider.resourceUrl;
       ctrl.settings.UserIdentifier = provider.userIdentifier;
       ctrl.settings.Scopes = provider.scopes;
+
+      if (provider.name === 'microsoft' && ctrl.state.microsoftTenantID !== '') {
+        onMicrosoftTenantIDChange();
+      }
     }
 
     function onInit() {
diff --git a/app/extensions/oauth/components/oauth-settings/oauth-settings.html b/app/extensions/oauth/components/oauth-settings/oauth-settings.html
index d71effc69..e6f5e13e8 100644
--- a/app/extensions/oauth/components/oauth-settings/oauth-settings.html
+++ b/app/extensions/oauth/components/oauth-settings/oauth-settings.html
@@ -205,10 +205,10 @@
   <div class="form-group" ng-if="$ctrl.state.provider.name != 'custom'">
     <div class="col-sm-12">
       <a class="small interactive" ng-if="!$ctrl.state.overrideConfiguration" ng-click="$ctrl.state.overrideConfiguration = true;">
-        <i class="fa fa-plus space-right" aria-hidden="true"></i> Override configuration
+        <i class="fa fa-wrench space-right" aria-hidden="true"></i> Override configuration
       </a>
       <a class="small interactive" ng-if="$ctrl.state.overrideConfiguration" ng-click="$ctrl.state.overrideConfiguration = false;">
-        <i class="fa fa-minus space-right" aria-hidden="true"></i> Hide advanced options
+        <i class="fa fa-cogs space-right" aria-hidden="true"></i> Use default configuration
       </a>
     </div>
   </div>