diff --git a/ctl/server.go b/ctl/server.go
index 66a8c63d4..a368637e3 100644
--- a/ctl/server.go
+++ b/ctl/server.go
@@ -125,9 +125,9 @@ func BuildServerFlags(cmd *cobra.Command, srv *server.Command) {
 	// OAuth2.0 identity provider configuration
 	flags.BoolVar(&srv.Config.Auth.Enable, "auth.enable", false, "Enable AuthN/AuthZ of featurebase, disabled by default.")
 	flags.StringVar(&srv.Config.Auth.ClientId, "auth.client-id", srv.Config.Auth.ClientId, "Identity Provider's Application/Client ID.")
-	flags.StringVar(&srv.Config.Auth.ClientSecret, "auth.client-secret", srv.Config.Auth.ClientSecret, "Identity Provider's Application/Client Secret.")
+	flags.StringVar(&srv.Config.Auth.ClientSecret, "auth.client-secret", srv.Config.Auth.ClientSecret, "Identity Provider's Client Secret.")
 	flags.StringVar(&srv.Config.Auth.AuthorizeURL, "auth.authorize-url", srv.Config.Auth.AuthorizeURL, "Identity Provider's Authorize URL.")
-	flags.StringVar(&srv.Config.Auth.TokenURL, "auth.token-url", srv.Config.Auth.TokenURL, "Identity Provider's Token URL for identity provider.")
+	flags.StringVar(&srv.Config.Auth.TokenURL, "auth.token-url", srv.Config.Auth.TokenURL, "Identity Provider's Token URL.")
 	flags.StringVar(&srv.Config.Auth.GroupEndpointURL, "auth.group-endpoint-url", srv.Config.Auth.GroupEndpointURL, "Identity Provider's Group endpoint URL.")
 
 }
diff --git a/server/config.go b/server/config.go
index c65ae7f9c..9f7a24e61 100644
--- a/server/config.go
+++ b/server/config.go
@@ -630,7 +630,7 @@ func lookupAddr(ctx context.Context, resolver *net.Resolver, host string) (strin
 }
 
 func (c *Config) ValidateAuth() error {
-	authURL := []string{
+	authConfig := []string{
 		"ClientId", c.Auth.ClientId,
 		"ClientSecret", c.Auth.ClientSecret,
 		"AuthorizeURL", c.Auth.AuthorizeURL,
@@ -638,10 +638,10 @@ func (c *Config) ValidateAuth() error {
 		"GroupEndpointURL", c.Auth.GroupEndpointURL,
 	}
 
-	n := len(authURL)
+	n := len(authConfig)
 	for i := 0; i < n; i += 2 {
-		name := authURL[i]
-		value := authURL[i+1]
+		name := authConfig[i]
+		value := authConfig[i+1]
 		if strings.Contains(name, "URL") {
 			_, err := url.ParseRequestURI(value)
 			if err != nil {