diff --git a/public/app/core/components/Login/LoginServiceButtons.tsx b/public/app/core/components/Login/LoginServiceButtons.tsx
index 026990ac93d..8714898b492 100644
--- a/public/app/core/components/Login/LoginServiceButtons.tsx
+++ b/public/app/core/components/Login/LoginServiceButtons.tsx
@@ -16,7 +16,7 @@ const loginServices: () => LoginServices = () => {
       name: 'Google',
     },
     azuread: {
-      enabled: config.oauth.azuread,
+      enabled: oauthEnabled && config.oauth.azuread,
       name: 'Microsoft',
     },
     github: {
@@ -34,7 +34,7 @@ const loginServices: () => LoginServices = () => {
       icon: 'grafana_com',
     },
     okta: {
-      enabled: config.oauth.okta,
+      enabled: oauthEnabled && config.oauth.okta,
       name: 'Okta',
     },
     oauth: {