From 2a02b38888743450a4c7dd9c8411c7ee12df03d0 Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Fri, 23 Apr 2021 11:55:15 +0200
Subject: [PATCH] fixing PR comment:

https://github.com/keycloak/keycloak-admin-ui/pull/474#issuecomment-825417974
---
 src/clients/add/CapabilityConfig.tsx | 9 +++++----
 src/clients/messages.json            | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/clients/add/CapabilityConfig.tsx b/src/clients/add/CapabilityConfig.tsx
index 7f1f5521d7..6bdb510cc5 100644
--- a/src/clients/add/CapabilityConfig.tsx
+++ b/src/clients/add/CapabilityConfig.tsx
@@ -187,11 +187,12 @@ export const CapabilityConfig = ({
                           label={t("serviceAccount")}
                           id="kc-flow-service-account"
                           name="serviceAccountsEnabled"
-                          isChecked={value}
-                          onChange={onChange}
-                          isDisabled={
-                            !clientAuthentication || clientAuthorization
+                          isChecked={
+                            value ||
+                            (clientAuthentication && clientAuthorization)
                           }
+                          onChange={onChange}
+                          isDisabled={clientAuthorization}
                         />
                         <HelpItem
                           helpText="clients-help:serviceAccount"
diff --git a/src/clients/messages.json b/src/clients/messages.json
index 457a03d864..2089ef937b 100644
--- a/src/clients/messages.json
+++ b/src/clients/messages.json
@@ -103,8 +103,8 @@
     "authentication": "Authentication",
     "authenticationFlow": "Authentication flow",
     "standardFlow": "Standard flow",
-    "directAccess": "Direct access",
-    "serviceAccount": "Service account roles",
+    "directAccess": "Direct access grants",
+    "serviceAccount": "Service account",
     "enableServiceAccount": "Enable service account roles",
     "assignRolesTo": "Assign roles to {{client}} account",
     "searchByRoleName": "Search by role name",