diff --git a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.sandbox.ts b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.sandbox.ts
index cd1c83d..45611ab 100644
--- a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.sandbox.ts
+++ b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.sandbox.ts
@@ -78,19 +78,15 @@
         this._checkIfCurrentAddressIsMainAddress(address);
       });
 
-    // this.actionsSubject
-    //   .pipe(
-    //     ofType(keycloakUserActions.loadKeycloakUsersSuccess),
-    //     map((action: keycloakUserActions.ILoadKeycloakUsersSuccess) => action.payload),
-    //     takeUntil(this._endSubscriptions$)
-    //   )
-    //   .subscribe((users: Array<KeycloakUser>) => {
-    //     this._keycloakUsers = users;
-    //   });
-    const user1: KeycloakUser = { username: 'admin', firstName: 'admin', lastName: 'admin' };
-    for (let index = 0; index < 40; index++) {
-      this._keycloakUsers.push(user1);
-    }
+    this.actionsSubject
+      .pipe(
+        ofType(keycloakUserActions.loadKeycloakUsersSuccess),
+        map((action: keycloakUserActions.ILoadKeycloakUsersSuccess) => action.payload),
+        takeUntil(this._endSubscriptions$)
+      )
+      .subscribe((users: Array<KeycloakUser>) => {
+        this._keycloakUsers = users;
+      });
 
     this.actionsSubject
       .pipe(
