diff --git a/src/app/shared/subscriptions/models/subscription.model.ts b/src/app/shared/subscriptions/models/subscription.model.ts
index 36e43ce996..b460a0418f 100644
--- a/src/app/shared/subscriptions/models/subscription.model.ts
+++ b/src/app/shared/subscriptions/models/subscription.model.ts
@@ -39,8 +39,8 @@ export class Subscription extends DSpaceObject {
   @deserialize
   _links: {
     self: HALLink;
-    ePerson: HALLink;
-    dSpaceObject: HALLink;
+    eperson: HALLink;
+    resource: HALLink;
   };
 
   /**
@@ -48,14 +48,14 @@ export class Subscription extends DSpaceObject {
    * Will be undefined unless the logo {@link HALLink} has been resolved.
    */
   @link(EPERSON)
-  ePerson?: Observable<RemoteData<EPerson>>;
+  eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The logo for this Community
    * Will be undefined unless the logo {@link HALLink} has been resolved.
    */
   @link(DSPACE_OBJECT)
-  dSpaceObject?: Observable<RemoteData<DSpaceObject>>;
+  resource?: Observable<RemoteData<DSpaceObject>>;
   /**
    * The embedded ePerson & dSpaceObject for this Subscription
    */
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index f78567ee7b..156b8717f9 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -30,7 +30,7 @@
             (click)="activeModal.close()">
       {{'item.page.subscriptions.modal.close' | translate}}
     </button>
-    <button type="submit" class="btn btn-success" [disabled]="(processing$ | async)">
+    <button type="submit" class="btn btn-success" [disabled]="(processing$ | async) || !isValid">
         <span *ngIf="(processing$ | async)">
           <i class='fas fa-circle-notch fa-spin'></i> {{'item.page.subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index c7ff9882ac..fa7aec9273 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -66,6 +66,10 @@ export class SubscriptionModalComponent implements OnInit {
    */
   private frequencyDefaultValues = ['D', 'M', 'W'];
 
+  /**
+   * True if form status has changed and at least one frequency is checked
+   */
+  isValid = false;
   /**
    * Event emitted when a given subscription has been updated
    */
@@ -98,6 +102,14 @@ export class SubscriptionModalComponent implements OnInit {
         this.initFormByAllSubscriptions();
       }
     });
+
+    this.subscriptionForm.valueChanges.subscribe((newValue) => {
+      let anyFrequencySelected = false;
+      for (let f of this.frequencyDefaultValues) {
+        anyFrequencySelected = anyFrequencySelected || newValue.content.frequencies[f];
+      }
+      this.isValid = anyFrequencySelected;
+    });
   }
 
   private initFormByAllSubscriptions(): void {
diff --git a/src/app/shared/subscriptions/subscriptions-data.service.ts b/src/app/shared/subscriptions/subscriptions-data.service.ts
index cf1e90ef96..44e306b529 100644
--- a/src/app/shared/subscriptions/subscriptions-data.service.ts
+++ b/src/app/shared/subscriptions/subscriptions-data.service.ts
@@ -143,7 +143,7 @@ export class SubscriptionsDataService extends IdentifiableDataService<Subscripti
    * @param options                     options for the find all request
    */
   findAllSubscriptions(options?): Observable<RemoteData<PaginatedList<Subscription>>> {
-    return this.findAllData.findAll(options, true, true, followLink('dSpaceObject'), followLink('ePerson'));
+    return this.findAllData.findAll(options, true, true, followLink('resource'), followLink('eperson'));
   }
 
 
@@ -164,7 +164,7 @@ export class SubscriptionsDataService extends IdentifiableDataService<Subscripti
 
     return this.getEndpoint().pipe(
       map(href => `${href}/search/${this.findByEpersonLinkPath}`),
-      switchMap(href => this.findListByHref(href, optionsWithObject, true, true, followLink('dSpaceObject'), followLink('ePerson')))
+      switchMap(href => this.findListByHref(href, optionsWithObject, false, true, followLink('resource'), followLink('eperson')))
     );
 
 
diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html
index a327ec658c..ed31e16759 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.html
+++ b/src/app/subscriptions-page/subscriptions-page.component.html
@@ -24,8 +24,8 @@
                   </thead>
                   <tbody>
                     <tr ds-subscription-view *ngFor="let subscription of subscriptions?.page"
-                                             [dso]="(subscription?.dSpaceObject | async)?.payload"
-                                             [eperson]="(subscription?.ePerson | async)?.payload?.id"
+                                             [dso]="(subscription?.resource | async)?.payload"
+                                             [eperson]="(subscription?.eperson | async)?.payload?.id"
                                              [subscription]="subscription"
                                              (reload)="refresh()">
                     </tr>