diff --git a/src/app/pages/persons/external-person/external-person-details/external-person-details.component.html b/src/app/pages/persons/external-person/external-person-details/external-person-details.component.html
index ac40572..d03ec35 100644
--- a/src/app/pages/persons/external-person/external-person-details/external-person-details.component.html
+++ b/src/app/pages/persons/external-person/external-person-details/external-person-details.component.html
@@ -114,7 +114,7 @@
             <button *visibleByRight type="button" class="btn btn-success person-buttons" (click)="externalPersonSandBox.persistExternalPerson()">
               {{ 'SaveBtn' | translate }}
             </button>
-            <button type="button" class="btn btn-primary person-buttons" routerLink="/overview">
+            <button type="button" class="btn btn-primary person-buttons cancel-button" routerLink="/overview">
               {{ 'CancelBtn' | translate }}
             </button>
           </div>
diff --git a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.html b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.html
index 509a3b8..29a9637 100644
--- a/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.html
+++ b/src/app/pages/persons/internal-person/internal-person-details/internal-person-details.component.html
@@ -194,7 +194,7 @@
             <button *visibleByRight type="button" class="btn btn-success person-buttons" (click)="internalPersonSandBox.persistInternalPerson()">
               {{ 'SaveBtn' | translate }}
             </button>
-            <button type="button" class="btn btn-primary person-buttons" routerLink="/overview">
+            <button type="button" class="btn btn-primary person-buttons cancel-button" routerLink="/overview">
               {{ 'CancelBtn' | translate }}
             </button>
           </div>
diff --git a/src/app/shared/components/anonymizer/anonymizer.component.spec.ts b/src/app/shared/components/anonymizer/anonymizer.component.spec.ts
index a86a100..07642e4 100644
--- a/src/app/shared/components/anonymizer/anonymizer.component.spec.ts
+++ b/src/app/shared/components/anonymizer/anonymizer.component.spec.ts
@@ -16,6 +16,7 @@
   let component: AnonymizerComponent;
   const sandbox: any = {
     anonymizeContact: () => {},
+    endSubscriptions: () => {},
   };
 
   beforeEach(() => {
@@ -31,4 +32,10 @@
     component.anonymizeContact();
     expect(spy).toHaveBeenCalled();
   });
+
+  it('should reset component', () => {
+    component.contactId = 'x';
+    component.ngOnDestroy();
+    expect(component.contactId).toBe(null);
+  });
 });
diff --git a/src/app/shared/components/anonymizer/anonymizer.component.ts b/src/app/shared/components/anonymizer/anonymizer.component.ts
index 4975934..b843de9 100644
--- a/src/app/shared/components/anonymizer/anonymizer.component.ts
+++ b/src/app/shared/components/anonymizer/anonymizer.component.ts
@@ -26,4 +26,9 @@
   public anonymizeContact() {
     this._sandbox.anonymizeContact(this.contactId);
   }
+
+  ngOnDestroy() {
+    this._sandbox.endSubscriptions();
+    this.contactId = null;
+  }
 }