diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index eebfdbd829..b236365df5 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -35,6 +35,7 @@
                 </header>
                 <div class="pl-2 space-children-mr">
                   <ds-dso-page-edit-button *ngIf="isCollectionAdmin$ | async"  [pageRoute]="collectionPageRoute$ | async" [dso]="collection" [tooltipMsg]="'collection.page.edit'"></ds-dso-page-edit-button>
+                  <ds-dso-page-subscription-button [dso]="collection"></ds-dso-page-subscription-button>
                 </div>
               </div>
               <section class="comcol-page-browse-section">
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index 368fec08a5..1b88877f8b 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -22,6 +22,7 @@
         </header>
         <div class="pl-2 space-children-mr">
           <ds-dso-page-edit-button *ngIf="isCommunityAdmin$ | async" [pageRoute]="communityPageRoute$ | async" [dso]="communityPayload" [tooltipMsg]="'community.page.edit'"></ds-dso-page-edit-button>
+          <ds-dso-page-subscription-button [dso]="communityPayload"></ds-dso-page-subscription-button>
         </div>
       </div>
       <section class="comcol-page-browse-section">
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index bf73a62447..e12b8a5ceb 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -6,6 +6,7 @@
                                 [tooltipMsgCreate]="'item.page.version.create'"
                                 [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalissue.page.edit'"></ds-dso-page-edit-button>
+    <ds-dso-page-subscription-button [dso]="object"></ds-dso-page-subscription-button>
   </div>
 </div>
 <div class="row">
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index b370431a27..1bc9ec1137 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -6,6 +6,7 @@
                                 [tooltipMsgCreate]="'item.page.version.create'"
                                 [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalvolume.page.edit'"></ds-dso-page-edit-button>
+    <ds-dso-page-subscription-button [dso]="object"></ds-dso-page-subscription-button>
   </div>
 </div>
 <div class="row">
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index 27ee373237..b787e937d6 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -6,6 +6,7 @@
                                 [tooltipMsgCreate]="'item.page.version.create'"
                                 [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journal.page.edit'"></ds-dso-page-edit-button>
+    <ds-dso-page-subscription-button [dso]="object"></ds-dso-page-subscription-button>
   </div>
 </div>
 <div class="row">
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index ac92e4ad6d..524adae4ce 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -6,6 +6,7 @@
                                 [tooltipMsgCreate]="'item.page.version.create'"
                                 [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'orgunit.page.edit'"></ds-dso-page-edit-button>
+    <ds-dso-page-subscription-button [dso]="object"></ds-dso-page-subscription-button>
   </div>
 </div>
 <div class="row">
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index a73236006b..998c07777f 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -7,6 +7,7 @@
                                 [tooltipMsgCreate]="'item.page.version.create'"
                                 [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'person.page.edit'"></ds-dso-page-edit-button>
+    <ds-dso-page-subscription-button [dso]="object"></ds-dso-page-subscription-button>
     <ds-person-page-claim-button [object]="object"></ds-person-page-claim-button>
   </div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 3fb5e2d520..b52f5aa8dd 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -6,6 +6,7 @@
                                 [tooltipMsgCreate]="'item.page.version.create'"
                                 [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'project.page.edit'"></ds-dso-page-edit-button>
+    <ds-dso-page-subscription-button [dso]="object"></ds-dso-page-subscription-button>
   </div>
 </div>
 <div class="row">
diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
index ee4ead2835..60aa6d6f86 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -10,6 +10,7 @@
           <div class="pl-2 space-children-mr">
             <ds-dso-page-edit-button [pageRoute]="itemPageRoute$ | async" [dso]="item"
                                      [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
+            <ds-dso-page-subscription-button [dso]="item"></ds-dso-page-subscription-button>
           </div>
         </div>
         <div class="simple-view-link my-3" *ngIf="!fromSubmissionObject">
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index 5c3e5e77b0..806bd4baaf 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -15,6 +15,7 @@
                                 [tooltipMsgCreate]="'item.page.version.create'"
                                 [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
+    <ds-dso-page-subscription-button [dso]="object"></ds-dso-page-subscription-button>
   </div>
 </div>
 <div class="row">
diff --git a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts
index 39e685b465..f97439c1a1 100644
--- a/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts
+++ b/src/app/shared/dso-page/dso-page-subscription-button/dso-page-subscription-button.component.ts
@@ -1,8 +1,10 @@
 import { Component, Input, OnInit } from '@angular/core';
+
 import { Observable, of } from 'rxjs';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { SubscriptionModalComponent } from '../../subscriptions/subscription-modal/subscription-modal.component';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 
@@ -23,16 +25,10 @@ export class DsoPageSubscriptionButtonComponent implements OnInit {
    */
   public modalRef: NgbModalRef;
 
-  /**
-   * EPerson id of the logged user
-   */
-  ePersonId: string;
-
   /**
    * DSpaceObject that is being viewed
    */
-  @Input()
-  dso: DSpaceObject;
+  @Input() dso: DSpaceObject;
 
   constructor(
     protected authorizationService: AuthorizationDataService,
@@ -40,10 +36,16 @@ export class DsoPageSubscriptionButtonComponent implements OnInit {
   ) {
   }
 
+  /**
+   * check if the current DSpaceObject can be subscribed by the user
+   */
   ngOnInit(): void {
     this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanSubscribe, this.dso.self);
   }
 
+  /**
+   * Open the modal to subscribe to the related DSpaceObject
+   */
   public openSubscriptionModal() {
     this.modalRef = this.modalService.open(SubscriptionModalComponent);
     this.modalRef.componentInstance.dso = this.dso;