diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index 72a9530b54..c955ef737c 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -192,9 +192,9 @@
 
   "admin.access-control.epeople.table.edit": "Edit",
 
-  "item.access-control.epeople.table.edit.buttons.edit": "Edit",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Edit",
 
-  "item.access-control.epeople.table.edit.buttons.remove": "Remove",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Remove",
 
   "admin.access-control.epeople.no-items": "No EPeople to show.",
 
@@ -241,6 +241,7 @@
   "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
 
 
+
   "admin.access-control.groups.title": "DSpace Angular :: Groups",
 
   "admin.access-control.groups.head": "Groups",
@@ -276,8 +277,6 @@
 
   "admin.access-control.groups.form.groupDescription": "Description",
 
-  "admin.access-control.groups.form.button.return": "Return",
-
   "admin.access-control.groups.form.notification.created.success": "Successfully created group \"{{name}}\"",
 
   "admin.access-control.groups.form.notification.created.failure": "Failed to create group \"{{name}}\"",
@@ -350,7 +349,7 @@
 
   "admin.access-control.groups.form.subgroups-list.button.see-all": "Search all",
 
-  "admin.access-control.groups.form.return": "Return",
+  "admin.access-control.groups.form.return": "Return to groups",
 
 
 
diff --git a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
index 4fd663a6b8..591fe272d1 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.ts
@@ -1,7 +1,8 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
+import { Subscription } from 'rxjs/internal/Subscription';
 import { map, take } from 'rxjs/operators';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { RemoteData } from '../../../core/data/remote-data';
@@ -19,7 +20,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
  * A component used for managing all existing epeople within the repository.
  * The admin can create, edit or delete epeople here.
  */
-export class EPeopleRegistryComponent {
+export class EPeopleRegistryComponent implements OnInit, OnDestroy {
 
   labelPrefix = 'admin.access-control.epeople.';
 
@@ -45,15 +46,28 @@ export class EPeopleRegistryComponent {
   // The search form
   searchForm;
 
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
   constructor(private epersonService: EPersonDataService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
               private formBuilder: FormBuilder) {
+  }
+
+  ngOnInit() {
+    this.isEPersonFormShown = false;
     this.updateEPeople({
       currentPage: 1,
       elementsPerPage: this.config.pageSize
     });
-    this.isEPersonFormShown = false;
+    this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
+      if (eperson != null && eperson.id) {
+        this.isEPersonFormShown = true;
+      }
+    }));
     this.searchForm = this.formBuilder.group(({
       scope: 'metadata',
       query: '',
@@ -151,6 +165,13 @@ export class EPeopleRegistryComponent {
     }
   }
 
+  /**
+   * Unsub all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+  }
+
   scrollToTop() {
     (function smoothscroll() {
       const currentScroll = document.documentElement.scrollTop || document.body.scrollTop;
diff --git a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html
index 5ab10c94a3..578862b561 100644
--- a/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -39,7 +39,8 @@
         <tbody>
         <tr *ngFor="let group of (groups | async)?.payload?.page">
           <td>{{group.id}}</td>
-          <td><a [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group.id)]">{{group.name}}</a></td>
+          <td><a (click)="groupsDataService.startEditingNewGroup(group)"
+                 [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
         </tr>
         </tbody>
       </table>
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
index 415a0bb12e..0b8889fb28 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/group-form.component.ts
@@ -134,7 +134,6 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   onCancel() {
     this.groupDataService.cancelEditGroup();
     this.cancelForm.emit();
-    this.router.navigate([this.groupDataService.getGroupRegistryRouterLink()]);
   }
 
   /**
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html
index 5fb30ecf82..2025419e52 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.html
@@ -22,12 +22,12 @@
   </form>
 
   <ds-pagination *ngIf="(ePeople | async)?.payload.totalElements > 0"
-    [paginationOptions]="config"
-    [pageInfoState]="(ePeople | async)?.payload"
-    [collectionSize]="(ePeople | async)?.payload?.totalElements"
-    [hideGear]="true"
-    [hidePagerWhenSinglePage]="true"
-    (pageChange)="onPageChange($event)">
+                 [paginationOptions]="config"
+                 [pageInfoState]="(ePeople | async)?.payload"
+                 [collectionSize]="(ePeople | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 (pageChange)="onPageChange($event)">
 
     <div class="table-responsive">
       <table id="groups" class="table table-striped table-hover table-bordered">
@@ -41,7 +41,8 @@
         <tbody>
         <tr *ngFor="let ePerson of (ePeople | async)?.payload?.page">
           <td>{{ePerson.id}}</td>
-          <td>{{ePerson.name}}</td>
+          <td><a (click)="ePersonDataService.startEditingNewEPerson(ePerson)"
+                 [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">{{ePerson.name}}</a></td>
           <td>
             <div class="btn-group edit-field">
               <button *ngIf="(isMemberOfGroup(ePerson) | async)"
@@ -66,12 +67,15 @@
 
   </ds-pagination>
 
-  <div *ngIf="(ePeople | async)?.payload.totalElements == 0 && !searchDone" class="alert alert-info w-100 mb-2" role="alert">
+  <div *ngIf="(ePeople | async)?.payload.totalElements == 0 && !searchDone" class="alert alert-info w-100 mb-2"
+       role="alert">
     {{messagePrefix + '.no-members-yet' | translate}}
-    <button (click)="search({query: ''})" class="btn btn-primary">{{messagePrefix + '.button.see-all' | translate}}</button>
+    <button (click)="search({query: ''})"
+            class="btn btn-primary">{{messagePrefix + '.button.see-all' | translate}}</button>
   </div>
 
-  <div *ngIf="(ePeople | async)?.payload.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2" role="alert">
+  <div *ngIf="(ePeople | async)?.payload.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2"
+       role="alert">
     {{messagePrefix + '.no-items' | translate}}
   </div>
 
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts
index 7bb41725b1..116b4d74e1 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -55,7 +55,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
   searchDone: boolean;
 
   constructor(private groupDataService: GroupDataService,
-              private ePersonDataService: EPersonDataService,
+              public ePersonDataService: EPersonDataService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
               private formBuilder: FormBuilder) {
diff --git a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
index 16de581e96..72f17fc25c 100644
--- a/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
+++ b/src/app/+admin/admin-access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
@@ -16,12 +16,12 @@
   </form>
 
   <ds-pagination *ngIf="(groups | async)?.payload.totalElements > 0"
-    [paginationOptions]="config"
-    [pageInfoState]="(groups | async)?.payload"
-    [collectionSize]="(groups | async)?.payload?.totalElements"
-    [hideGear]="true"
-    [hidePagerWhenSinglePage]="true"
-    (pageChange)="onPageChange($event)">
+                 [paginationOptions]="config"
+                 [pageInfoState]="(groups | async)?.payload"
+                 [collectionSize]="(groups | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 (pageChange)="onPageChange($event)">
 
     <div class="table-responsive">
       <table id="groups" class="table table-striped table-hover table-bordered">
@@ -35,7 +35,8 @@
         <tbody>
         <tr *ngFor="let group of (groups | async)?.payload?.page">
           <td>{{group.id}}</td>
-          <td>{{group.name}}</td>
+          <td><a (click)="groupDataService.startEditingNewGroup(group)"
+                 [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
           <td>
             <div class="btn-group edit-field">
               <button *ngIf="(isSubgroupOfGroup(group) | async)"
@@ -60,12 +61,15 @@
 
   </ds-pagination>
 
-  <div *ngIf="(groups | async)?.payload.totalElements == 0 && !searchDone" class="alert alert-info w-100 mb-2" role="alert">
+  <div *ngIf="(groups | async)?.payload.totalElements == 0 && !searchDone" class="alert alert-info w-100 mb-2"
+       role="alert">
     {{messagePrefix + '.no-subgroups-yet' | translate}}
-    <button (click)="search({query: ''})" class="btn btn-primary">{{messagePrefix + '.button.see-all' | translate}}</button>
+    <button (click)="search({query: ''})"
+            class="btn btn-primary">{{messagePrefix + '.button.see-all' | translate}}</button>
   </div>
 
-  <div *ngIf="(groups | async)?.payload.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2" role="alert">
+  <div *ngIf="(groups | async)?.payload.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2"
+       role="alert">
     {{messagePrefix + '.no-items' | translate}}
   </div>
 
diff --git a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html
index d54ab7f2c7..d0cde805c0 100644
--- a/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html
+++ b/src/app/+admin/admin-access-control/group-registry/groups-registry.component.html
@@ -54,7 +54,7 @@
 <!--              <td>{{getOptionalComColFromName(group.name)}}</td>-->
               <td>
                 <div class="btn-group edit-field">
-                  <button [routerLink]="[group.id]" class="btn btn-outline-primary btn-sm"
+                  <button [routerLink]="groupService.getGroupEditPageRouterLink(group)" class="btn btn-outline-primary btn-sm"
                           title="{{messagePrefix + 'table.edit.buttons.edit' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>
                   </button>
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index ec8b96d1cd..964f447ff8 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -219,4 +219,27 @@ export class EPersonDataService extends DataService<EPerson> {
     return this.delete(ePerson.id);
   }
 
+  /**
+   * Change which ePerson is being edited and return the link for EPeople edit page
+   * @param ePerson New EPerson to edit
+   */
+  public startEditingNewEPerson(ePerson: EPerson): string {
+    this.getActiveEPerson().pipe(take(1)).subscribe((activeEPerson: EPerson) => {
+      if (ePerson === activeEPerson) {
+        this.cancelEditEPerson();
+      } else {
+        this.editEPerson(ePerson);
+      }
+    });
+    return '/admin/access-control/epeople';
+  }
+
+  /**
+   * Get EPeople admin page
+   * @param ePerson New EPerson to edit
+   */
+  public getEPeoplePageRouterLink(): string {
+    return '/admin/access-control/epeople';
+  }
+
 }
diff --git a/src/app/core/eperson/group-data.service.ts b/src/app/core/eperson/group-data.service.ts
index 17c9829483..0a3712ff6c 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -259,8 +259,27 @@ export class GroupDataService extends DataService<Group> {
     return '/admin/access-control/groups';
   }
 
-  public getGroupEditPageRouterLink(groupId: string): string {
-    return '/admin/access-control/groups/' + groupId;
+  /**
+   * Change which group is being edited and return the link for the edit page of the new group being edited
+   * @param newGroup New group to edit
+   */
+  public startEditingNewGroup(newGroup: Group): string {
+    this.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
+      if (newGroup === activeGroup) {
+        this.cancelEditGroup()
+      } else {
+        this.editGroup(newGroup)
+      }
+    });
+    return '/admin/access-control/groups/' + newGroup.id;
+  }
+
+  /**
+   * Get Edit page of group
+   * @param group Group we want edit page for
+   */
+  public getGroupEditPageRouterLink(group: Group): string {
+    return '/admin/access-control/groups/' + group.id;
   }
 
 }