diff --git a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html
index 2877f145af..bfced55d14 100644
--- a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html
+++ b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.html
@@ -21,6 +21,7 @@ limitations under the License.
 <link rel="import" href="../../../bower_components/iron-input/iron-input.html">
 <link rel="import" href="../../../styles/gr-form-styles.html">
 <link rel="import" href="../../../styles/shared-styles.html">
+<link rel="import" href="../../shared/gr-account-link/gr-account-link.html">
 <link rel="import" href="../../shared/gr-autocomplete/gr-autocomplete.html">
 <link rel="import" href="../../shared/gr-button/gr-button.html">
 <link rel="import" href="../../shared/gr-overlay/gr-overlay.html">
@@ -107,7 +108,7 @@ limitations under the License.
                     <template is="dom-repeat" items="[[_groupMembers]]">
                       <tr>
                         <td class="nameColumn">
-                          <a href$="[[_memberUrl(item)]]">[[item.name]]</a>
+                          <gr-account-link account="[[item]]"></gr-account-link>
                         </td>
                         <td>[[item.email]]</td>
                         <td hidden$="[[!_groupOwner]]">
diff --git a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.js b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.js
index 57b5c6058c..cde6c66ecc 100644
--- a/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.js
+++ b/polygerrit-ui/app/elements/admin/gr-group-members/gr-group-members.js
@@ -93,18 +93,6 @@
       return this._loading || this._loading === undefined;
     },
 
-    _memberUrl(item) {
-      if (item.email) {
-        item = item.email;
-      } else if (item.username) {
-        item = item.username;
-      } else {
-        item = item.name;
-      }
-      return this.getBaseUrl() + '/q/owner:' + this.encodeURL(item, true) +
-          ' status:open';
-    },
-
     _groupUrl(item) {
       return this.getBaseUrl() + '/admin/groups/' + this.encodeURL(item, true);
     },
diff --git a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.js b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.js
index a90158f955..7a120c0718 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.js
+++ b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.js
@@ -32,7 +32,8 @@
     _computeOwnerLink(account) {
       if (!account) { return; }
       return Gerrit.Nav.getUrlForOwner(
-          account.email || account.username || account._account_id);
+          account.email || account.username || account.name ||
+          account._account_id);
     },
 
     _computeShowEmail(account) {