diff --git a/src/app/core/auth/auth-object-factory.ts b/src/app/core/auth/auth-object-factory.ts
index e37475d94c..02458f4e3e 100644
--- a/src/app/core/auth/auth-object-factory.ts
+++ b/src/app/core/auth/auth-object-factory.ts
@@ -4,6 +4,7 @@ import { NormalizedAuthStatus } from './models/normalized-auth-status.model';
 import { NormalizedEPerson } from '../eperson/models/normalized-eperson.model';
 import { NormalizedObject } from '../cache/models/normalized-object.model';
 import { CacheableObject } from '../cache/object-cache.reducer';
+import { NormalizedGroup } from '../eperson/models/normalized-group.model';
 
 export class AuthObjectFactory {
   public static getConstructor(type): GenericConstructor<NormalizedObject<CacheableObject>> {
@@ -12,6 +13,10 @@ export class AuthObjectFactory {
         return NormalizedEPerson
       }
 
+      case AuthType.Group: {
+        return NormalizedGroup
+      }
+
       case AuthType.Status: {
         return NormalizedAuthStatus
       }
diff --git a/src/app/core/auth/auth-type.ts b/src/app/core/auth/auth-type.ts
index 9a248da91f..f0460449ea 100644
--- a/src/app/core/auth/auth-type.ts
+++ b/src/app/core/auth/auth-type.ts
@@ -1,4 +1,5 @@
 export enum AuthType {
   EPerson = 'eperson',
-  Status = 'status'
+  Status = 'status',
+  Group = 'group'
 }
diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts
index 6102f930b0..334aadd379 100644
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -26,7 +26,6 @@ export abstract class BaseResponseParsingService {
       } else if (Array.isArray(data)) {
         return this.processArray(data, requestUUID);
       } else if (isRestDataObject(data)) {
-        data = this.fixBadEPersonRestResponse(data);
         const object = this.deserialize(data);
         if (isNotEmpty(data._embedded)) {
           Object
@@ -141,23 +140,4 @@ export abstract class BaseResponseParsingService {
   protected retrieveObjectOrUrl(obj: any): any {
     return this.toCache ? obj.self : obj;
   }
-
-  // TODO Remove when https://jira.duraspace.org/browse/DS-4006 is fixed
-  // See https://github.com/DSpace/dspace-angular/issues/292
-  private fixBadEPersonRestResponse(obj: any): any {
-    if (obj.type === ResourceType.EPerson) {
-      const groups = obj.groups;
-      const normGroups = [];
-      if (isNotEmpty(groups)) {
-        groups.forEach((group) => {
-            const parts = ['eperson', 'groups', group.uuid];
-            const href = new RESTURLCombiner(this.EnvConfig, ...parts).toString();
-            normGroups.push(href);
-          }
-        )
-      }
-      return Object.assign({}, obj, { groups: normGroups });
-    }
-    return obj;
-  }
 }