diff --git a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
index d69c90c78a..3eb3304106 100644
--- a/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
+++ b/themes/src/main/resources/theme/base/admin/messages/admin-messages_en.properties
@@ -600,6 +600,10 @@ encryption-key=Encryption Key
 saml-encryption-key.tooltip=SAML Encryption Key.
 service-accounts=Service Accounts
 service-account.available-roles.tooltip=Realm level roles that can be assigned to service account. Contains effectively assigned roles which are not directly assigned.
+service-account=Service Account
+service-account.roles=Service Account Roles
+service-account.user=Service Account User
+service-account.user.tooltip=Username the Service Account. To manage details and group mappings click on the username.
 service-account.assigned-roles.tooltip=Realm level roles assigned to service account.
 service-account-is-not-enabled-for=Service account is not enabled for {{client}}
 create-protocol-mappers=Create Protocol Mappers
diff --git a/themes/src/main/resources/theme/base/admin/resources/partials/client-service-account-roles.html b/themes/src/main/resources/theme/base/admin/resources/partials/client-service-account-roles.html
index bc17f1b242..36905a7b2f 100644
--- a/themes/src/main/resources/theme/base/admin/resources/partials/client-service-account-roles.html
+++ b/themes/src/main/resources/theme/base/admin/resources/partials/client-service-account-roles.html
@@ -7,10 +7,23 @@
 
     <kc-tabs-client></kc-tabs-client>
 
-    <h2><span>{{client.clientId}}</span> {{:: 'service-accounts' | translate}} </h2>
-    <p class="subtitle"></p>
-
     <form class="form-horizontal" name="realmForm" novalidate kc-read-only="!client.access.configure" data-ng-show="client.serviceAccountsEnabled">
+
+        <h2>{{:: 'service-account' | translate}}</h2>
+
+        <div class="form-group">
+            <label class="col-md-2 control-label">{{:: 'service-account.user' | translate}}</label>
+            <div class="col-md-6">
+                <a class="form-control" ng-href="#/realms/{{realm.realm}}/users/{{user.id}}">{{user.username}}</a>
+            </div>
+            <kc-tooltip>{{:: 'service-account.user.tooltip' | translate}}</kc-tooltip>
+        </div>
+        <p class="subtitle"></p>
+
+
+        <h2>{{:: 'service-account.roles' | translate}}</h2>
+        <p class="subtitle"></p>
+
         <div class="form-group">
             <label class="col-md-2 control-label" class="control-label">{{:: 'realm-roles' | translate}}</label>
             <div class="col-md-10">