diff --git a/cmd/common-main.go b/cmd/common-main.go
index db4e21aad..f0618bd91 100644
--- a/cmd/common-main.go
+++ b/cmd/common-main.go
@@ -138,7 +138,7 @@ func minioConfigToConsoleFeatures() {
 	}
 	// if IDP is enabled, set IDP environment variables
 	if globalOpenIDConfig.URL != nil {
-		os.Setenv("CONSOLE_IDP_URL", globalOpenIDConfig.DiscoveryDoc.Issuer)
+		os.Setenv("CONSOLE_IDP_URL", globalOpenIDConfig.URL.String())
 		os.Setenv("CONSOLE_IDP_CLIENT_ID", globalOpenIDConfig.ClientID)
 		os.Setenv("CONSOLE_IDP_SECRET", globalOpenIDConfig.ClientSecret)
 		os.Setenv("CONSOLE_IDP_HMAC_SALT", globalDeploymentID)
diff --git a/cmd/server-main.go b/cmd/server-main.go
index f9ee5b76f..1cb14ae51 100644
--- a/cmd/server-main.go
+++ b/cmd/server-main.go
@@ -596,6 +596,14 @@ func serverMain(ctx *cli.Context) {
 		}()
 	}
 
+	if serverDebugLog {
+		logger.Info("== DEBUG Mode enabled ==")
+		logger.Info("Currently set environment settings:")
+		for _, v := range os.Environ() {
+			logger.Info(v)
+		}
+		logger.Info("======")
+	}
 	<-globalOSSignalCh
 }