diff --git a/charts/policy-reporter/charts/ui/templates/config.yaml b/charts/policy-reporter/charts/ui/templates/config.yaml
index 1022fb86..3de286cf 100644
--- a/charts/policy-reporter/charts/ui/templates/config.yaml
+++ b/charts/policy-reporter/charts/ui/templates/config.yaml
@@ -45,7 +45,7 @@ data:
 
     apiConfig:
       logging: {{ .Values.api.logging }}
-      secretRef: {{ .Values.global.basicAuth.secretRef }}
       basicAuth:
         username: {{ .Values.global.basicAuth.username }}
-        password: {{ .Values.global.basicAuth.password }}
\ No newline at end of file
+        password: {{ .Values.global.basicAuth.password }}
+        secretRef: {{ .Values.global.basicAuth.secretRef }}
\ No newline at end of file
diff --git a/charts/policy-reporter/charts/ui/values.yaml b/charts/policy-reporter/charts/ui/values.yaml
index e7e84cab..0a20e513 100644
--- a/charts/policy-reporter/charts/ui/values.yaml
+++ b/charts/policy-reporter/charts/ui/values.yaml
@@ -146,13 +146,17 @@ resources: {}
 
 serviceAccount:
   # Specifies whether a service account should be created
-  create: false
+  create: true
   # Annotations to add to the service account
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
+# Create secret reader role and rolebinding
+rbac:
+  enabled: true
+
 service:
   enabled: true
   ## configuration of service
diff --git a/pkg/config/target_factory.go b/pkg/config/target_factory.go
index 00235358..cf8b3c71 100644
--- a/pkg/config/target_factory.go
+++ b/pkg/config/target_factory.go
@@ -181,6 +181,8 @@ func (f *TargetFactory) UIClient(config *UI) target.Client {
 		return nil
 	}
 
+	setFallback(&config.Name, "UI")
+
 	zap.L().Info("UI configured")
 
 	return ui.NewClient(ui.Options{