From 97c6efbc0edcbf9f35243f914b5d6711d234ab2b Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 29 Apr 2020 14:04:32 +0300
Subject: [PATCH] Fix login page redirected from password reset (#24032)

(cherry picked from commit afc78339bde472f887014833a02a7cef8ba7d477)
---
 public/app/core/components/Login/LoginServiceButtons.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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: {