diff --git a/pkg/pipeline/CiConfig.go b/pkg/pipeline/CiConfig.go
index 8332380c9a..8031aaddba 100644
--- a/pkg/pipeline/CiConfig.go
+++ b/pkg/pipeline/CiConfig.go
@@ -99,7 +99,7 @@ func GetCiConfig() (*CiConfig, error) {
 		cfg.NodeLabel[kv[0]] = kv[1]
 	}
 	//validation for supported cloudproviders
-	if !(cfg.CloudProvider != CLOUD_PROVIDER_AWS && cfg.CloudProvider != CLOUD_PROVIDER_AZURE) {
+	if cfg.CloudProvider != CLOUD_PROVIDER_AWS && cfg.CloudProvider != CLOUD_PROVIDER_AZURE {
 		return nil, fmt.Errorf("unsupported cloudprovider: %s", cfg.CloudProvider)
 	}
 	return cfg, err
diff --git a/pkg/sso/SSOLoginService.go b/pkg/sso/SSOLoginService.go
index 5f9be48992..7a3c6e4ac2 100644
--- a/pkg/sso/SSOLoginService.go
+++ b/pkg/sso/SSOLoginService.go
@@ -288,16 +288,17 @@ func (impl SSOLoginServiceImpl) GetById(id int32) (*bean.SSOLoginDto, error) {
 }
 
 func (impl SSOLoginServiceImpl) GetAll() ([]*bean.SSOLoginDto, error) {
+	ssoConfigs := make([]*bean.SSOLoginDto, 0)
 
 	models, err := impl.ssoLoginRepository.GetAll()
-	if err != nil {
+	if err != nil && err != pg.ErrNoRows {
 		impl.logger.Errorw("error in update new sso login config", "error", err)
 		return nil, err
 	}
-
-	var ssoLoginDtos []*bean.SSOLoginDto
+	if err == pg.ErrNoRows {
+		return ssoConfigs, nil
+	}
 	for _, model := range models {
-
 		var config json.RawMessage
 		err = json.Unmarshal([]byte(model.Config), &config)
 		if err != nil {
@@ -311,9 +312,9 @@ func (impl SSOLoginServiceImpl) GetAll() ([]*bean.SSOLoginDto, error) {
 			Active: model.Active,
 			//Config: config,
 		}
-		ssoLoginDtos = append(ssoLoginDtos, ssoLoginDto)
+		ssoConfigs = append(ssoConfigs, ssoLoginDto)
 	}
-	return ssoLoginDtos, nil
+	return ssoConfigs, nil
 }
 
 func (impl SSOLoginServiceImpl) GetByName(name string) (*bean.SSOLoginDto, error) {
diff --git a/pkg/user/TokenCache.go b/pkg/user/TokenCache.go
index 31f3e14e12..05240f1f14 100644
--- a/pkg/user/TokenCache.go
+++ b/pkg/user/TokenCache.go
@@ -61,8 +61,8 @@ func (impl *TokenCache) BuildACDSynchContext() (acdContext context.Context, err
 type ACDAuthConfig struct {
 	ACDUsername           string `env:"ACD_USERNAME" `
 	ACDPassword           string `env:"ACD_PASSWORD" `
-	ACDConfigMapName      string `env:"ACD_CM" `
-	ACDConfigMapNamespace string `env:"ACD_NAMESPACE" `
+	ACDConfigMapName      string `env:"ACD_CM" envDefault:"argocd-cm"`
+	ACDConfigMapNamespace string `env:"ACD_NAMESPACE" envDefault:"devtroncd"`
 }
 
 func GetACDAuthConfig() (*ACDAuthConfig, error) {