diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html
index 38c0743709f6646ef8de728f179516b6816277d7..f46f056c58fb938cc6f39cc266a170a325494661 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUser/PaginatedList.html
@@ -11,6 +11,7 @@
         <thead>
         <tr>
             <th colspan="2"><f:translate key="userName" /> / <f:translate key="realName" /></th>
+            <th><f:translate key="backendUserGroup" /></th>
             <th><f:translate key="lastLogin" /></th>
             <th class="col-control"></th>
         </tr>
@@ -30,7 +31,7 @@
                         </a>
                     </td>
                     <td class="col-title">
-                        <backend:link.editRecord table="be_users" uid="{backendUser.uid}" title="edit">
+                        <backend:link.editRecord table="be_users" uid="{backendUser.uid}" title="{f:translate(key:'edit')}">
                             <b>{backendUser.userName}</b>
                         </backend:link.editRecord>
                         <f:if condition="{onlineBackendUsers.{backendUser.uid}}">
@@ -39,11 +40,16 @@
                         <beuser:mfaStatus userUid="{backendUser.uid}"/>
                         <br>
                         <f:if condition="{backendUser.realName}">
-                            <backend:link.editRecord table="be_users" uid="{backendUser.uid}" title="edit">
+                            <backend:link.editRecord table="be_users" uid="{backendUser.uid}" title="{f:translate(key:'edit')}">
                                 {backendUser.realName}
                             </backend:link.editRecord>
                         </f:if>
                     </td>
+                    <td class="nowrap-disabled">
+                        <f:for each="{backendUser.backendUserGroups}" as="backendUserGroup" iteration="backendUserGroupIterator">
+                            <backend:link.editRecord table="be_groups" uid="{backendUserGroup.uid}" title="{f:translate(key:'edit')}" class="nowrap">{backendUserGroup.title}</backend:link.editRecord><f:if condition="!{backendUserGroupIterator.isLast}">,</f:if>
+                        </f:for>
+                    </td>
                     <td class="col-datetime">
                         <f:if condition="{backendUser.lastLoginDateAndTime}">
                             <f:then>
diff --git a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html
index ab80d82f7036101d6d5f3b6c28fe9e79fb772af5..be96a40452ff3bb9905e7f03c6688da9a26a0daa 100644
--- a/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html
+++ b/typo3/sysext/beuser/Resources/Private/Partials/BackendUserGroup/PaginatedList.html
@@ -30,22 +30,19 @@
                         </a>
                     </td>
                     <td class="title">
-                        <backend:link.editRecord table="be_groups" uid="{backendUserGroup.uid}" title="edit">
+                        <backend:link.editRecord table="be_groups" uid="{backendUserGroup.uid}" title="{f:translate(key:'edit')}">
                             <b>{backendUserGroup.title}</b><br>
                             {backendUser.realName}
                         </backend:link.editRecord>
                     </td>
                     <td class="nowrap-disabled">
                         <f:for each="{backendUserGroup.subgroups}" as="subgroup" iteration="subGroupIterator">
-                            <backend:link.editRecord table="be_groups" uid="{subgroup.uid}" title="edit">
-                                {subgroup.title}
-                            </backend:link.editRecord>
-                            <f:if condition="!{subGroupIterator.isLast}">, </f:if>
+                            <backend:link.editRecord table="be_groups" uid="{subgroup.uid}" title="{f:translate(key:'edit')}">{subgroup.title}</backend:link.editRecord><f:if condition="!{subGroupIterator.isLast}">,</f:if>
                         </f:for>
                     </td>
                     <td class="col-control">
                         <div class="btn-group" role="group">
-                            <backend:link.editRecord class="btn btn-default" table="be_groups" uid="{backendUserGroup.uid}" title="edit">
+                            <backend:link.editRecord class="btn btn-default" table="be_groups" uid="{backendUserGroup.uid}" title="{f:translate(key:'edit')}">
                                 <core:icon identifier="actions-open" />
                             </backend:link.editRecord>
                             <f:if condition="{backendUserGroup.hidden}">
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html
index 140bc1287c40b4d6bb56fa916de0651b5f43c6d1..b7bde5fc1eadd34e78605b649b5dc46f8befb793 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/Compare.html
@@ -24,7 +24,7 @@
                                     <f:link.action action="removeFromCompareList" arguments="{uid: compareData.user.uid, redirectToCompare:1}" class="btn btn-default">
                                         <core:icon identifier="actions-minus" size="small"/>
                                     </f:link.action>
-                                    <backend:link.editRecord class="btn btn-default" table="be_users" uid="{compareData.user.uid}" title="edit">
+                                    <backend:link.editRecord class="btn btn-default" table="be_users" uid="{compareData.user.uid}" title="{f:translate(key:'edit')}">
                                         <core:icon identifier="actions-open" />
                                     </backend:link.editRecord>
                                 </div>
diff --git a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/List.html b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/List.html
index 1a4b083ae2c24bef952d01dc6d85d04fb1718bc7..a8c3a652c8d1b8d2b44f7dffdaf85651aec394bb 100644
--- a/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/List.html
+++ b/typo3/sysext/beuser/Resources/Private/Templates/BackendUser/List.html
@@ -29,7 +29,7 @@
                                 </a>
                             </td>
                             <td class="col-title">
-                                <backend:link.editRecord table="be_users" uid="{compareUser.uid}" title="edit">
+                                <backend:link.editRecord table="be_users" uid="{compareUser.uid}" title="{f:translate(key:'edit')}">
                                     <b>{compareUser.username}</b>
                                 </backend:link.editRecord>
                                 <f:if condition="{onlineBackendUsers.{compareUser.uid}}">
@@ -37,7 +37,7 @@
                                 </f:if>
                                 <br>
                                 <f:if condition="{compareUser.realName}">
-                                    <backend:link.editRecord table="be_users" uid="{compareUser.uid}" title="edit">
+                                    <backend:link.editRecord table="be_users" uid="{compareUser.uid}" title="{f:translate(key:'edit')}">
                                         {compareUser.realName}
                                     </backend:link.editRecord>
                                 </f:if>
diff --git a/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/CompareUserCest.php b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/CompareUserCest.php
index 2d83ea8099318d35f2c8d82596661acd9cfbcdd1..41f18419d491743aa87e0d9a891391350962cdb1 100644
--- a/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/CompareUserCest.php
+++ b/typo3/sysext/core/Tests/Acceptance/Application/BackendUser/CompareUserCest.php
@@ -47,7 +47,7 @@ final class CompareUserCest
 
         // first user can be edited
         $usernameFirstCompare = $I->grabTextFrom('#tx_beuser_compare > thead > tr > th:nth-child(2) > div > div > span');
-        $I->click('#tx_beuser_compare > thead > tr > th:nth-child(2) a[title="edit"]');
+        $I->click('#tx_beuser_compare > thead > tr > th:nth-child(2) a[title="Edit"]');
         $I->waitForElementNotVisible('#t3js-ui-block');
         $I->waitForElementVisible('#EditDocumentController');
         $I->canSee('Edit Backend user "' . $usernameFirstCompare . '" on root level');
@@ -59,7 +59,7 @@ final class CompareUserCest
 
         // second user can be edited
         $usernameFirstCompare = $I->grabTextFrom('#tx_beuser_compare > thead > tr > th:nth-child(3) > div > div > span');
-        $I->click('#tx_beuser_compare > thead > tr > th:nth-child(3) a[title="edit"]');
+        $I->click('#tx_beuser_compare > thead > tr > th:nth-child(3) a[title="Edit"]');
         $I->waitForElementNotVisible('#t3js-ui-block');
         $I->waitForElementVisible('#EditDocumentController');
         $I->canSee('Edit Backend user "' . $usernameFirstCompare . '" on root level');