diff --git a/README.md b/README.md
index 78d7816f65..5d8a323461 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ DSPACE_REST_SSL # Whether the angular REST uses SSL [true/false]
 
 The same settings can also be overwritten by setting system environment variables instead, E.g.:
 ```bash 
-export DSPACE_HOST=https://dspace7.4science.cloud/server
+export DSPACE_HOST=dspace7.4science.cloud
 ```
 
 The priority works as follows: **environment variable** overrides **variable in `.env` file** overrides **`environment.(prod, dev or test).ts`** overrides **`environment.common.ts`**
diff --git a/package.json b/package.json
index 36462cc724..21a89400bf 100644
--- a/package.json
+++ b/package.json
@@ -91,6 +91,7 @@
     "express": "4.16.2",
     "fast-json-patch": "^2.0.7",
     "file-saver": "^1.3.8",
+    "filesize": "^6.1.0",
     "font-awesome": "4.7.0",
     "https": "1.0.0",
     "js-cookie": "2.2.0",
@@ -100,7 +101,7 @@
     "moment": "^2.22.1",
     "morgan": "^1.9.1",
     "ng-mocks": "^8.1.0",
-    "ng2-file-upload": "1.2.1",
+    "ng2-file-upload": "1.4.0",
     "ng2-nouislider": "^1.8.2",
     "ngx-bootstrap": "^5.3.2",
     "ngx-infinite-scroll": "6.0.1",
diff --git a/src/app/+admin/admin-registries/admin-registries-routing.module.ts b/src/app/+admin/admin-registries/admin-registries-routing.module.ts
index afdc46bf17..8833b307b9 100644
--- a/src/app/+admin/admin-registries/admin-registries-routing.module.ts
+++ b/src/app/+admin/admin-registries/admin-registries-routing.module.ts
@@ -4,6 +4,7 @@ import { NgModule } from '@angular/core';
 import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
 import { URLCombiner } from '../../core/url-combiner/url-combiner';
 import { getRegistriesModulePath } from '../admin-routing.module';
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const BITSTREAMFORMATS_MODULE_PATH = 'bitstream-formats';
 
@@ -14,16 +15,28 @@ export function getBitstreamFormatsModulePath() {
 @NgModule({
   imports: [
     RouterModule.forChild([
-      {path: 'metadata', component: MetadataRegistryComponent, data: {title: 'admin.registries.metadata.title'}},
       {
-        path: 'metadata/:schemaName',
-        component: MetadataSchemaComponent,
-        data: {title: 'admin.registries.schema.title'}
+        path: 'metadata',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: {title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata'},
+        children: [
+          {
+            path: '',
+            component: MetadataRegistryComponent
+          },
+          {
+            path: ':schemaName',
+            resolve: { breadcrumb: I18nBreadcrumbResolver },
+            component: MetadataSchemaComponent,
+            data: {title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema'}
+          }
+        ]
       },
       {
         path: BITSTREAMFORMATS_MODULE_PATH,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
         loadChildren: './bitstream-formats/bitstream-formats.module#BitstreamFormatsModule',
-        data: {title: 'admin.registries.bitstream-formats.title'}
+        data: {title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats'}
       },
     ])
   ]
diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
index 67f6aa373e..2f08f8257c 100644
--- a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
+++ b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
@@ -4,6 +4,7 @@ import { BitstreamFormatsResolver } from './bitstream-formats.resolver';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
 import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const BITSTREAMFORMAT_EDIT_PATH = ':id/edit';
 const BITSTREAMFORMAT_ADD_PATH = 'add';
@@ -17,14 +18,18 @@ const BITSTREAMFORMAT_ADD_PATH = 'add';
       },
       {
         path: BITSTREAMFORMAT_ADD_PATH,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AddBitstreamFormatComponent,
+        data: {breadcrumbKey: 'admin.registries.bitstream-formats.create'}
       },
       {
         path: BITSTREAMFORMAT_EDIT_PATH,
         component: EditBitstreamFormatComponent,
         resolve: {
-          bitstreamFormat: BitstreamFormatsResolver
-        }
+          bitstreamFormat: BitstreamFormatsResolver,
+          breadcrumb: I18nBreadcrumbResolver
+        },
+        data: {breadcrumbKey: 'admin.registries.bitstream-formats.edit'}
       },
     ])
   ],
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index a254f20428..42b7558397 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -11,7 +11,6 @@
             <ds-pagination
                     *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
                     [paginationOptions]="config"
-                    [pageInfoState]="(metadataSchemas | async)?.payload"
                     [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
                     [hideGear]="true"
                     [hidePagerWhenSinglePage]="true"
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 302974b5c2..cd845329c6 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -4,7 +4,7 @@ import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map, take } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
@@ -12,6 +12,8 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { Route, Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -37,6 +39,11 @@ export class MetadataRegistryComponent {
     pageSize: 25
   });
 
+  /**
+   * Whether or not the list of MetadataSchemas needs an update
+   */
+  needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+
   constructor(private registryService: RegistryService,
               private notificationsService: NotificationsService,
               private router: Router,
@@ -50,14 +57,17 @@ export class MetadataRegistryComponent {
    */
   onPageChange(event) {
     this.config.currentPage = event;
-    this.updateSchemas();
+    this.forceUpdateSchemas();
   }
 
   /**
    * Update the list of schemas by fetching it from the rest api or cache
    */
   private updateSchemas() {
-    this.metadataSchemas = this.registryService.getMetadataSchemas(this.config);
+    this.metadataSchemas = this.needsUpdate$.pipe(
+      filter((update) => update === true),
+      switchMap(() => this.registryService.getMetadataSchemas(toFindListOptions(this.config)))
+    );
   }
 
   /**
@@ -65,8 +75,7 @@ export class MetadataRegistryComponent {
    * a new REST call
    */
   public forceUpdateSchemas() {
-    this.registryService.clearMetadataSchemaRequests().subscribe();
-    this.updateSchemas();
+    this.needsUpdate$.next(true);
   }
 
   /**
@@ -125,6 +134,7 @@ export class MetadataRegistryComponent {
    * Delete all the selected metadata schemas
    */
   deleteSchemas() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
     this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
       (schemas) => {
         const tasks$ = [];
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
index db2294ab59..a840d68dcf 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -21,7 +21,8 @@ describe('MetadataSchemaFormComponent', () => {
   const registryServiceStub = {
     getActiveMetadataSchema: () => observableOf(undefined),
     createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
-    cancelEditMetadataSchema: () => {}
+    cancelEditMetadataSchema: () => {},
+    clearMetadataSchemaRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 23e7309a00..79129d68a4 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -128,6 +128,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created schema using the EventEmitter submitForm
    */
   onSubmit() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
     this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
       (schema) => {
         const values = {
@@ -139,7 +140,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
             this.submitForm.emit(newSchema);
           });
         } else {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), {
+          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
             id: schema.id,
             prefix: (values.prefix ? values.prefix : schema.prefix),
             namespace: (values.namespace ? values.namespace : schema.namespace)
@@ -148,6 +149,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
           });
         }
         this.clearFields();
+        this.registryService.cancelEditMetadataSchema();
       }
     );
   }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
index 402f9c0c86..98128a6a61 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -30,6 +30,7 @@ describe('MetadataFieldFormComponent', () => {
     createOrUpdateMetadataField: (field: MetadataField) => observableOf(field),
     cancelEditMetadataField: () => {},
     cancelEditMetadataSchema: () => {},
+    clearMetadataFieldRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 0811530343..42f6441791 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -153,6 +153,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created field using the EventEmitter submitForm
    */
   onSubmit() {
+    this.registryService.clearMetadataFieldRequests().subscribe();
     this.registryService.getActiveMetadataField().pipe(take(1)).subscribe(
       (field) => {
         const values = {
@@ -166,7 +167,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
             this.submitForm.emit(newField);
           });
         } else {
-          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), {
+          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), field, {
             id: field.id,
             schema: this.metadataSchema,
             element: (values.element ? values.element : field.element),
@@ -177,6 +178,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
           });
         }
         this.clearFields();
+        this.registryService.cancelEditMetadataField();
       }
     );
   }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
index 4a7a4cf34d..49ef748349 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -1,36 +1,37 @@
 <div class="container">
   <div class="metadata-schema row">
-    <div class="col-12">
+    <div class="col-12" *ngVar="(metadataSchema$ | async) as schema">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{(metadataSchema | async)?.payload?.prefix}}"</h2>
+      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h2>
 
-      <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:namespace }}</p>
+      <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:{ namespace: schema?.namespace } }}</p>
 
       <ds-metadata-field-form
-        [metadataSchema]="(metadataSchema | async)?.payload"
+        [metadataSchema]="schema"
         (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
 
       <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
 
-      <ds-pagination
-        *ngIf="(metadataFields | async)?.payload?.totalElements > 0"
-        [paginationOptions]="config"
-        [pageInfoState]="(metadataFields | async)?.payload"
-        [collectionSize]="(metadataFields | async)?.payload?.totalElements"
-        [hideGear]="false"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
-        <div class="table-responsive">
-          <table id="metadata-fields" class="table table-striped table-hover">
-            <thead>
+      <ng-container *ngVar="(metadataFields$ | async)?.payload as fields">
+        <ds-pagination
+          *ngIf="fields?.totalElements > 0"
+          [paginationOptions]="config"
+          [pageInfoState]="fields"
+          [collectionSize]="fields?.totalElements"
+          [hideGear]="false"
+          [hidePagerWhenSinglePage]="true"
+          (pageChange)="onPageChange($event)">
+          <div class="table-responsive">
+            <table id="metadata-fields" class="table table-striped table-hover">
+              <thead>
               <tr>
                 <th></th>
                 <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
               </tr>
-            </thead>
-            <tbody>
-              <tr *ngFor="let field of (metadataFields | async)?.payload?.page"
+              </thead>
+              <tbody>
+              <tr *ngFor="let field of fields?.page"
                   [ngClass]="{'table-primary' : isActive(field) | async}">
                 <td>
                   <label>
@@ -39,22 +40,23 @@
                            (change)="selectMetadataField(field, $event)">
                   </label>
                 </td>
-                <td class="selectable-row" (click)="editField(field)">{{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
+                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
               </tr>
-            </tbody>
-          </table>
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+
+        <div *ngIf="fields?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+          {{'admin.registries.schema.fields.no-items' | translate}}
         </div>
-      </ds-pagination>
 
-      <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{'admin.registries.schema.fields.no-items' | translate}}
-      </div>
-
-      <div>
-        <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
-        <button *ngIf="(metadataFields | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
-      </div>
+        <div>
+          <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
+          <button *ngIf="fields?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+        </div>
+      </ng-container>
 
     </div>
   </div>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index c63bbc6089..26f4c90b0c 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -22,6 +22,7 @@ import { RestResponse } from '../../../core/cache/response.models';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { VarDirective } from '../../../shared/utils/var.directive';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
@@ -124,7 +125,7 @@ describe('MetadataSchemaComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe],
+      declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: ActivatedRoute, useValue: activatedRouteStub },
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 2974c1c087..96872573b9 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -5,7 +5,7 @@ import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map, take } from 'rxjs/operators';
+import { map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
@@ -13,6 +13,10 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 
 @Component({
   selector: 'ds-metadata-schema',
@@ -24,21 +28,15 @@ import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
  * The admin can create, edit or delete metadata fields here.
  */
 export class MetadataSchemaComponent implements OnInit {
-
-  /**
-   * The namespace of the metadata schema
-   */
-  namespace;
-
   /**
    * The metadata schema
    */
-  metadataSchema: Observable<RemoteData<MetadataSchema>>;
+  metadataSchema$: Observable<MetadataSchema>;
 
   /**
    * A list of all the fields attached to this metadata schema
    */
-  metadataFields: Observable<RemoteData<PaginatedList<MetadataField>>>;
+  metadataFields$: Observable<RemoteData<PaginatedList<MetadataField>>>;
 
   /**
    * Pagination config used to display the list of metadata fields
@@ -49,6 +47,11 @@ export class MetadataSchemaComponent implements OnInit {
     pageSizeOptions: [25, 50, 100, 200]
   });
 
+  /**
+   * Whether or not the list of MetadataFields needs an update
+   */
+  needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+
   constructor(private registryService: RegistryService,
               private route: ActivatedRoute,
               private notificationsService: NotificationsService,
@@ -68,7 +71,7 @@ export class MetadataSchemaComponent implements OnInit {
    * @param params
    */
   initialize(params) {
-    this.metadataSchema = this.registryService.getMetadataSchemaByName(params.schemaName);
+    this.metadataSchema$ = this.registryService.getMetadataSchemaByName(params.schemaName).pipe(getFirstSucceededRemoteDataPayload());
     this.updateFields();
   }
 
@@ -78,18 +81,20 @@ export class MetadataSchemaComponent implements OnInit {
    */
   onPageChange(event) {
     this.config.currentPage = event;
-    this.updateFields();
+    this.forceUpdateFields();
   }
 
   /**
    * Update the list of fields by fetching it from the rest api or cache
    */
   private updateFields() {
-    this.metadataSchema.subscribe((schemaData) => {
-      const schema = schemaData.payload;
-      this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema, this.config);
-      this.namespace = {namespace: schemaData.payload.namespace};
-    });
+    this.metadataFields$ = combineLatest(this.metadataSchema$, this.needsUpdate$).pipe(
+      switchMap(([schema, update]: [MetadataSchema, boolean]) => {
+        if (update) {
+          return this.registryService.getMetadataFieldsBySchema(schema, toFindListOptions(this.config));
+        }
+      })
+    );
   }
 
   /**
@@ -97,8 +102,7 @@ export class MetadataSchemaComponent implements OnInit {
    * a new REST call
    */
   public forceUpdateFields() {
-    this.registryService.clearMetadataFieldRequests().subscribe();
-    this.updateFields();
+    this.needsUpdate$.next(true);
   }
 
   /**
@@ -157,6 +161,7 @@ export class MetadataSchemaComponent implements OnInit {
    * Delete all the selected metadata fields
    */
   deleteFields() {
+    this.registryService.clearMetadataFieldRequests().subscribe();
     this.registryService.getSelectedMetadataFields().pipe(take(1)).subscribe(
       (fields) => {
         const tasks$ = [];
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
index f11313fb6d..eedebae80b 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
@@ -145,11 +145,17 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
             this.modalService.open(CreateItemParentSelectorComponent);
           }
         } as OnClickMenuItemModel,
-        // model: {
-        //   type: MenuItemType.LINK,
-        //   text: 'menu.section.new_item',
-        //   link: '/submit'
-        // } as LinkMenuItemModel,
+      },
+      {
+        id: 'new_process',
+        parentID: 'new',
+        active: false,
+        visible: true,
+        model: {
+          type: MenuItemType.LINK,
+          text: 'menu.section.new_process',
+          link: '/processes/new'
+        } as LinkMenuItemModel,
       },
       {
         id: 'new_item_version',
@@ -439,6 +445,19 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
         icon: 'cogs',
         index: 9
       },
+      /* Processes */
+      {
+        id: 'processes',
+        active: false,
+        visible: true,
+        model: {
+          type: MenuItemType.LINK,
+          text: 'menu.section.processes',
+          link: '/processes'
+        } as LinkMenuItemModel,
+        icon: 'terminal',
+        index: 10
+      },
       /* Workflow */
       {
         id: 'workflow',
diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
index 37fe15bd40..1f6e288608 100644
--- a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
+++ b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.scss
@@ -1,4 +1,4 @@
-::ng-deep {
+:host ::ng-deep {
     .fa-chevron-right {
         padding-left: $spacer/2;
         font-size: 0.5rem;
@@ -16,4 +16,4 @@
         display: flex;
         flex-direction: column;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
index acb23fe592..44cb4099f0 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
@@ -32,6 +32,7 @@ import { ItemVersionHistoryComponent } from './item-version-history/item-version
 import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
 import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
 import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
+import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
 
 /**
  * Module that contains all components related to the Edit Item page administrator functionality
@@ -75,7 +76,8 @@ import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/cr
     ResourcePolicyCreateComponent,
   ],
   providers: [
-    BundleDataService
+    BundleDataService,
+    ObjectValuesPipe
   ]
 })
 export class EditItemPageModule {
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index dc017a9f92..82ca1f58d9 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -36,7 +36,8 @@
     <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles"
                                    [bundle]="bundle"
                                    [item]="item"
-                                   [columnSizes]="columnSizes">
+                                   [columnSizes]="columnSizes"
+                                   (dropObject)="dropBitstream(bundle, $event)">
     </ds-item-edit-bitstream-bundle>
   </div>
   <div *ngIf="bundles?.length === 0"
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
index cc1ec39bad..125fc1fb0c 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
@@ -188,8 +188,21 @@ describe('ItemBitstreamsComponent', () => {
     it('should not call deleteAndReturnResponse on the bitstreamService for the unmarked field', () => {
       expect(bitstreamService.deleteAndReturnResponse).not.toHaveBeenCalledWith(bitstream1.id);
     });
+  });
 
-    it('should send out a patch for the move operations', () => {
+  describe('when dropBitstream is called', () => {
+    beforeEach((done) => {
+      comp.dropBitstream(bundle, {
+        fromIndex: 0,
+        toIndex: 50,
+        // tslint:disable-next-line:no-empty
+        finish: () => {
+          done();
+        }
+      })
+    });
+
+    it('should send out a patch for the move operation', () => {
       expect(bundleService.patch).toHaveBeenCalled();
     });
   });
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 009cc978b2..45b8e23108 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,6 +1,6 @@
-import { ChangeDetectorRef, Component, Inject, OnDestroy } from '@angular/core';
+import { ChangeDetectorRef, Component, NgZone, OnDestroy } from '@angular/core';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import { Observable } from 'rxjs/internal/Observable';
 import { Subscription } from 'rxjs/internal/Subscription';
 import { ItemDataService } from '../../../core/data/item-data.service';
@@ -9,8 +9,8 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
-import { zip as observableZip, combineLatest as observableCombineLatest, of as observableOf } from 'rxjs';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { zip as observableZip, of as observableOf } from 'rxjs';
 import { ErrorResponse, RestResponse } from '../../../core/cache/response.models';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { RequestService } from '../../../core/data/request.service';
@@ -22,8 +22,6 @@ import { Bundle } from '../../../core/shared/bundle.model';
 import { FieldUpdate, FieldUpdates } from '../../../core/data/object-updates/object-updates.reducer';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { FieldChangeType } from '../../../core/data/object-updates/object-updates.actions';
-import { Operation } from 'fast-json-patch';
-import { MoveOperation } from 'fast-json-patch/lib/core';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
 import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
@@ -90,7 +88,8 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     public objectCache: ObjectCacheService,
     public requestService: RequestService,
     public cdRef: ChangeDetectorRef,
-    public bundleService: BundleDataService
+    public bundleService: BundleDataService,
+    public zone: NgZone
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
@@ -143,7 +142,6 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
 
   /**
    * Submit the current changes
-   * Bitstreams that were dragged around send out a patch request with move operations to the rest API
    * Bitstreams marked as deleted send out a delete request to the rest API
    * Display notifications and reset the current item/updates
    */
@@ -151,32 +149,6 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     this.submitting = true;
     const bundlesOnce$ = this.bundles$.pipe(take(1));
 
-    // Fetch all move operations for each bundle
-    const moveOperations$ = bundlesOnce$.pipe(
-      switchMap((bundles: Bundle[]) => observableZip(...bundles.map((bundle: Bundle) =>
-        this.objectUpdatesService.getMoveOperations(bundle.self).pipe(
-          take(1),
-          map((operations: MoveOperation[]) => [...operations.map((operation: MoveOperation) => Object.assign(operation, {
-            from: `/_links/bitstreams${operation.from}/href`,
-            path: `/_links/bitstreams${operation.path}/href`
-          }))])
-        )
-      )))
-    );
-
-    // Send out an immediate patch request for each bundle
-    const patchResponses$ = observableCombineLatest(bundlesOnce$, moveOperations$).pipe(
-      switchMap(([bundles, moveOperationList]: [Bundle[], Operation[][]]) =>
-        observableZip(...bundles.map((bundle: Bundle, index: number) => {
-          if (isNotEmpty(moveOperationList[index])) {
-            return this.bundleService.patch(bundle, moveOperationList[index]);
-          } else {
-            return observableOf(undefined);
-          }
-        }))
-      )
-    );
-
     // Fetch all removed bitstreams from the object update service
     const removedBitstreams$ = bundlesOnce$.pipe(
       switchMap((bundles: Bundle[]) => observableZip(
@@ -201,19 +173,42 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     );
 
     // Perform the setup actions from above in order and display notifications
-    patchResponses$.pipe(
-      switchMap((responses: RestResponse[]) => {
-        this.displayNotifications('item.edit.bitstreams.notifications.move', responses);
-        return removedResponses$
-      }),
-      take(1)
-    ).subscribe((responses: RestResponse[]) => {
+    removedResponses$.pipe(take(1)).subscribe((responses: RestResponse[]) => {
       this.displayNotifications('item.edit.bitstreams.notifications.remove', responses);
       this.reset();
       this.submitting = false;
     });
   }
 
+  /**
+   * A bitstream was dropped in a new location. Send out a Move Patch request to the REST API, display notifications,
+   * refresh the bundle's cache (so the lists can properly reload) and call the event's callback function (which will
+   * navigate the user to the correct page)
+   * @param bundle  The bundle to send patch requests to
+   * @param event   The event containing the index the bitstream came from and was dropped to
+   */
+  dropBitstream(bundle: Bundle, event: any) {
+    this.zone.runOutsideAngular(() => {
+      if (hasValue(event) && hasValue(event.fromIndex) && hasValue(event.toIndex) && hasValue(event.finish)) {
+        const moveOperation = Object.assign({
+          op: 'move',
+          from: `/_links/bitstreams/${event.fromIndex}/href`,
+          path: `/_links/bitstreams/${event.toIndex}/href`
+        });
+        this.bundleService.patch(bundle, [moveOperation]).pipe(take(1)).subscribe((response: RestResponse) => {
+          this.zone.run(() => {
+            this.displayNotifications('item.edit.bitstreams.notifications.move', [response]);
+            // Remove all cached requests from this bundle and call the event's callback when the requests are cleared
+            this.requestService.removeByHrefSubstring(bundle.self).pipe(
+              filter((isCached) => isCached),
+              take(1)
+            ).subscribe(() => event.finish());
+          });
+        });
+      }
+    });
+  }
+
   /**
    * Display notifications
    * - Error notification for each failed response with their message
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 58273bb931..c28ef9b525 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -17,5 +17,5 @@
       </div>
     </div>
   </div>
-  <ds-paginated-drag-and-drop-bitstream-list [bundle]="bundle" [columnSizes]="columnSizes"></ds-paginated-drag-and-drop-bitstream-list>
+  <ds-paginated-drag-and-drop-bitstream-list [bundle]="bundle" [columnSizes]="columnSizes" (dropObject)="dropObject.emit($event)"></ds-paginated-drag-and-drop-bitstream-list>
 </ng-template>
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 115e326241..72e2055bf7 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewContainerRef } from '@angular/core';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
@@ -36,6 +36,13 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   @Input() columnSizes: ResponsiveTableSizes;
 
+  /**
+   * Send an event when the user drops an object on the pagination
+   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
+   * not just within a single page)
+   */
+  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
+
   /**
    * The bootstrap sizes used for the Bundle Name column
    * This column stretches over the first 3 columns and thus is a combination of their sizes processed in ngOnInit
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
index 25941f472e..9197b89796 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
@@ -7,24 +7,29 @@
                [collectionSize]="(objectsRD$ | async)?.payload?.totalElements"
                [disableRouteParameterUpdate]="true"
                (pageChange)="switchPage($event)">
-  <div [id]="bundle.id" class="bundle-bitstreams-list"
-       [ngClass]="{'mb-3': (objectsRD$ | async)?.payload?.totalElements > pageSize}"
-       *ngVar="((updates$ | async) | dsObjectValues) as updateValues" cdkDropList (cdkDropListDropped)="drop($event)">
-    <div class="row bitstream-row" *ngFor="let updateValue of updateValues" cdkDrag
-         [id]="updateValue.field.uuid"
-         [ngClass]="{
-                  'table-warning': updateValue.changeType === 0,
-                  'table-danger': updateValue.changeType === 2,
-                  'table-success': updateValue.changeType === 1,
-                  'bg-white': updateValue.changeType === undefined
+  <ng-container *ngIf="!(loading$ | async)">
+    <div [id]="bundle.id" class="bundle-bitstreams-list"
+         [ngClass]="{'mb-3': (objectsRD$ | async)?.payload?.totalElements > pageSize}"
+         *ngVar="(updates$ | async) as updates" cdkDropList (cdkDropListDropped)="drop($event)">
+      <ng-container *ngIf="updates">
+        <div class="row bitstream-row" *ngFor="let uuid of customOrder" cdkDrag
+             [id]="uuid"
+             [ngClass]="{
+                  'table-warning': updates[uuid].changeType === 0,
+                  'table-danger': updates[uuid].changeType === 2,
+                  'table-success': updates[uuid].changeType === 1,
+                  'bg-white': updates[uuid].changeType === undefined
                 }">
-      <ds-item-edit-bitstream [fieldUpdate]="updateValue"
-                              [bundleUrl]="bundle.self"
-                              [columnSizes]="columnSizes">
-        <div class="d-flex align-items-center" slot="drag-handle" cdkDragHandle>
-          <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
+          <ds-item-edit-bitstream [fieldUpdate]="updates[uuid]"
+                                  [bundleUrl]="bundle.self"
+                                  [columnSizes]="columnSizes">
+            <div class="d-flex align-items-center" slot="drag-handle" cdkDragHandle>
+              <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
+            </div>
+          </ds-item-edit-bitstream>
         </div>
-      </ds-item-edit-bitstream>
+      </ng-container>
     </div>
-  </div>
+  </ng-container>
+  <ds-loading *ngIf="(loading$ | async)" [message]="'loading.bitstreams' | translate"></ds-loading>
 </ds-pagination>
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
index 03d1d00520..118f2b1619 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
@@ -16,12 +16,15 @@ import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-siz
 import { ResponsiveColumnSizes } from '../../../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../../../shared/testing/utils.test';
+import { RequestService } from '../../../../../core/data/request.service';
 
 describe('PaginatedDragAndDropBitstreamListComponent', () => {
   let comp: PaginatedDragAndDropBitstreamListComponent;
   let fixture: ComponentFixture<PaginatedDragAndDropBitstreamListComponent>;
   let objectUpdatesService: ObjectUpdatesService;
   let bundleService: BundleDataService;
+  let objectValuesPipe: ObjectValuesPipe;
+  let requestService: RequestService;
 
   const columnSizes = new ResponsiveTableSizes([
     new ResponsiveColumnSizes(2, 2, 3, 4, 4),
@@ -97,15 +100,24 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
     );
 
     bundleService = jasmine.createSpyObj('bundleService', {
-      getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+      getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
+      getBitstreamsEndpoint: observableOf('')
+    });
+
+    objectValuesPipe = new ObjectValuesPipe();
+
+    requestService = jasmine.createSpyObj('requestService', {
+      hasByHrefObservable: observableOf(true)
     });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [PaginatedDragAndDropBitstreamListComponent, VarDirective, ObjectValuesPipe],
+      declarations: [PaginatedDragAndDropBitstreamListComponent, VarDirective],
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: BundleDataService, useValue: bundleService }
+        { provide: BundleDataService, useValue: bundleService },
+        { provide: ObjectValuesPipe, useValue: objectValuesPipe },
+        { provide: RequestService, useValue: requestService }
       ], schemas: [
         NO_ERRORS_SCHEMA
       ]
diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
index 5548da4029..a288e9993a 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
@@ -8,6 +8,8 @@ import { switchMap } from 'rxjs/operators';
 import { PaginatedSearchOptions } from '../../../../../shared/search/paginated-search-options.model';
 import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
+import { RequestService } from '../../../../../core/data/request.service';
 
 @Component({
   selector: 'ds-paginated-drag-and-drop-bitstream-list',
@@ -33,8 +35,10 @@ export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginate
 
   constructor(protected objectUpdatesService: ObjectUpdatesService,
               protected elRef: ElementRef,
-              protected bundleService: BundleDataService) {
-    super(objectUpdatesService, elRef);
+              protected objectValuesPipe: ObjectValuesPipe,
+              protected bundleService: BundleDataService,
+              protected requestService: RequestService) {
+    super(objectUpdatesService, elRef, objectValuesPipe);
   }
 
   ngOnInit() {
@@ -46,11 +50,17 @@ export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginate
    */
   initializeObjectsRD(): void {
     this.objectsRD$ = this.currentPage$.pipe(
-      switchMap((page: number) => this.bundleService.getBitstreams(
-        this.bundle.id,
-        new PaginatedSearchOptions({pagination: Object.assign({}, this.options, { currentPage: page })}),
-        followLink('format')
-      ))
+      switchMap((page: number) => {
+        const paginatedOptions = new PaginatedSearchOptions({pagination: Object.assign({}, this.options, { currentPage: page })});
+        return this.bundleService.getBitstreamsEndpoint(this.bundle.id, paginatedOptions).pipe(
+          switchMap((href) => this.requestService.hasByHrefObservable(href)),
+          switchMap(() => this.bundleService.getBitstreams(
+            this.bundle.id,
+            paginatedOptions,
+            followLink('format')
+          ))
+        );
+      })
     );
   }
 
diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
index b8ab9bdb41..7c1719eb82 100644
--- a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
@@ -21,9 +21,9 @@
             </dl>
         </div>
         <div class="col-2">
-            <a [href]="file._links.content.href" [download]="file.name">
+            <ds-file-download-link [href]="file._links.content.href" [download]="file.name">
                 {{"item.page.filesection.download" | translate}}
-            </a>
+            </ds-file-download-link>
         </div>
     </div>
 </ds-metadata-field-wrapper>
diff --git a/src/app/+item-page/simple/field-components/file-section/file-section.component.html b/src/app/+item-page/simple/field-components/file-section/file-section.component.html
index 6533322e03..17e4a795e7 100644
--- a/src/app/+item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/+item-page/simple/field-components/file-section/file-section.component.html
@@ -1,11 +1,11 @@
 <ng-container *ngVar="(bitstreams$ | async) as bitstreams">
   <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="label | translate">
     <div class="file-section">
-      <a *ngFor="let file of bitstreams; let last=last;" [href]="file?._links.content.href" [download]="file?.name">
+      <ds-file-download-link *ngFor="let file of bitstreams; let last=last;" [href]="file?._links.content.href" [download]="file?.name">
         <span>{{file?.name}}</span>
         <span>({{(file?.sizeBytes) | dsFileSize }})</span>
         <span *ngIf="!last" innerHTML="{{separator}}"></span>
-      </a>
+      </ds-file-download-link>
     </div>
   </ds-metadata-field-wrapper>
 </ng-container>
diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
index 911ba26b31..4809f206ae 100644
--- a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
+++ b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
@@ -7,9 +7,9 @@
 
   </div>
   <div class="add">
-    <a class="btn btn-lg btn-primary mt-1 ml-2" [routerLink]="['/submit']" role="button">
+    <button class="btn btn-lg btn-primary mt-1 ml-2" (click)="openDialog()" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i> {{'mydspace.new-submission' | translate}}
-    </a>
+    </button>
   </div>
 
 </div>
diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
index ac9eea6c0c..16b50d18f0 100644
--- a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
+++ b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, inject, TestBed, tick, fakeAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
 import { Store } from '@ngrx/store';
@@ -21,6 +21,8 @@ import { NotificationsServiceStub } from '../../shared/testing/notifications-ser
 import { SharedModule } from '../../shared/shared.module';
 import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
 import { UploaderService } from '../../shared/uploader/uploader.service';
+import { By } from '@angular/platform-browser';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 describe('MyDSpaceNewSubmissionComponent test', () => {
 
@@ -54,6 +56,11 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
         { provide: ScrollToService, useValue: getMockScrollToService() },
         { provide: Store, useValue: store },
         { provide: TranslateService, useValue: translateService },
+        {
+          provide: NgbModal, useValue: {
+            open: () => {/*comment*/}
+          }
+        },
         ChangeDetectorRef,
         MyDSpaceNewSubmissionComponent,
         UploaderService
@@ -86,6 +93,25 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
     }));
   });
 
+  describe('', () => {
+    let fixture: ComponentFixture<MyDSpaceNewSubmissionComponent>;
+    let comp: MyDSpaceNewSubmissionComponent;
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(MyDSpaceNewSubmissionComponent);
+      comp = fixture.componentInstance;
+    });
+
+    it('should call app.openDialog', () => {
+      spyOn(comp, 'openDialog');
+      const submissionButton = fixture.debugElement.query(By.css('button.btn-primary'));
+      submissionButton.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      expect(comp.openDialog).toHaveBeenCalled();
+    });
+  });
 });
 
 // declare a test component
diff --git a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
index 81d66bb5f7..8d20a5736a 100644
--- a/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
@@ -15,6 +15,9 @@ import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { NotificationType } from '../../shared/notifications/models/notification-type';
 import { hasValue } from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/search-result.model';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { CreateItemParentSelectorComponent } from 'src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 
 /**
  * This component represents the whole mydspace page header
@@ -55,7 +58,9 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
               private halService: HALEndpointService,
               private notificationsService: NotificationsService,
               private store: Store<SubmissionState>,
-              private translate: TranslateService) {
+              private translate: TranslateService,
+              private router: Router,
+              private modalService: NgbModal) {
   }
 
   /**
@@ -105,6 +110,14 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
     this.notificationsService.error(null, this.translate.get('mydspace.upload.upload-failed'));
   }
 
+  /**
+   * Method called on clicking the button "New Submition", It opens a dialog for
+   * select a collection.
+   */
+  openDialog() {
+    this.modalService.open(CreateItemParentSelectorComponent);
+  }
+
   /**
    * Unsubscribe from the subscription
    */
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 0ba0851e4e..3bd2f64961 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -45,6 +45,20 @@ export function getProfileModulePath() {
   return `/${PROFILE_MODULE_PATH}`;
 }
 
+const REGISTER_PATH = 'register';
+
+export function getRegisterPath() {
+  return `/${REGISTER_PATH}`;
+
+}
+
+const FORGOT_PASSWORD_PATH = 'forgot';
+
+export function getForgotPasswordPath() {
+  return `/${FORGOT_PASSWORD_PATH}`;
+
+}
+
 const WORKFLOW_ITEM_MODULE_PATH = 'workflowitems';
 
 export function getWorkflowItemModulePath() {
@@ -71,6 +85,8 @@ export function getDSOPath(dso: DSpaceObject): string {
       { path: 'community-list', loadChildren: './community-list-page/community-list-page.module#CommunityListPageModule' },
       { path: 'id', loadChildren: './+lookup-by-id/lookup-by-id.module#LookupIdModule' },
       { path: 'handle', loadChildren: './+lookup-by-id/lookup-by-id.module#LookupIdModule' },
+      { path: REGISTER_PATH, loadChildren: './register-page/register-page.module#RegisterPageModule' },
+      { path: FORGOT_PASSWORD_PATH, loadChildren: './forgot-password/forgot-password.module#ForgotPasswordModule' },
       { path: COMMUNITY_MODULE_PATH, loadChildren: './+community-page/community-page.module#CommunityPageModule' },
       { path: COLLECTION_MODULE_PATH, loadChildren: './+collection-page/collection-page.module#CollectionPageModule' },
       { path: ITEM_MODULE_PATH, loadChildren: './+item-page/item-page.module#ItemPageModule' },
@@ -98,6 +114,7 @@ export function getDSOPath(dso: DSpaceObject): string {
         path: PROFILE_MODULE_PATH,
         loadChildren: './profile-page/profile-page.module#ProfilePageModule', canActivate: [AuthenticatedGuard]
       },
+      { path: 'processes', loadChildren: './process-page/process-page.module#ProcessPageModule', canActivate: [AuthenticatedGuard] },
       { path: '**', pathMatch: 'full', component: PageNotFoundComponent },
     ],
     {
diff --git a/src/app/community-list-page/community-list-datasource.ts b/src/app/community-list-page/community-list-datasource.ts
index 3a9d9f2077..b77cbb5246 100644
--- a/src/app/community-list-page/community-list-datasource.ts
+++ b/src/app/community-list-page/community-list-datasource.ts
@@ -1,3 +1,5 @@
+import { NgZone } from '@angular/core';
+import { FindListOptions } from '../core/data/request.models';
 import { CommunityListService, FlatNode } from './community-list-service';
 import { CollectionViewer, DataSource } from '@angular/cdk/typings/collections';
 import { BehaviorSubject, Observable, } from 'rxjs';
@@ -14,21 +16,23 @@ export class CommunityListDatasource implements DataSource<FlatNode> {
   private communityList$ = new BehaviorSubject<FlatNode[]>([]);
   public loading$ = new BehaviorSubject<boolean>(false);
 
-  constructor(private communityListService: CommunityListService) {
+  constructor(private communityListService: CommunityListService,
+              private zone: NgZone) {
   }
 
   connect(collectionViewer: CollectionViewer): Observable<FlatNode[]> {
     return this.communityList$.asObservable();
   }
 
-  loadCommunities(expandedNodes: FlatNode[]) {
+  loadCommunities(findOptions: FindListOptions, expandedNodes: FlatNode[]) {
     this.loading$.next(true);
-
-    this.communityListService.loadCommunities(expandedNodes).pipe(
-      take(1),
-      finalize(() => this.loading$.next(false)),
-    ).subscribe((flatNodes: FlatNode[]) => {
-      this.communityList$.next(flatNodes);
+    this.zone.runOutsideAngular(() => {
+      this.communityListService.loadCommunities(findOptions, expandedNodes).pipe(
+        take(1),
+        finalize(() => this.zone.run(() => this.loading$.next(false))),
+      ).subscribe((flatNodes: FlatNode[]) => {
+        this.zone.run(() => this.communityList$.next(flatNodes));
+      });
     });
   }
 
diff --git a/src/app/community-list-page/community-list-service.spec.ts b/src/app/community-list-page/community-list-service.spec.ts
index 6b7ab2bd77..accd0f23a5 100644
--- a/src/app/community-list-page/community-list-service.spec.ts
+++ b/src/app/community-list-page/community-list-service.spec.ts
@@ -1,21 +1,19 @@
-import { of as observableOf } from 'rxjs';
-import { TestBed, inject, async } from '@angular/core/testing';
+import { inject, TestBed } from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import { of as observableOf } from 'rxjs';
+import { take } from 'rxjs/operators';
 import { AppState } from '../app.reducer';
+import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
+import { PaginatedList } from '../core/data/paginated-list';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { StoreMock } from '../shared/testing/store.mock';
 import { CommunityListService, FlatNode, toFlatNode } from './community-list-service';
 import { CollectionDataService } from '../core/data/collection-data.service';
-import { PaginatedList } from '../core/data/paginated-list';
-import { PageInfo } from '../core/shared/page-info.model';
 import { CommunityDataService } from '../core/data/community-data.service';
-import {
-  createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject$
-} from '../shared/remote-data.utils';
 import { Community } from '../core/shared/community.model';
 import { Collection } from '../core/shared/collection.model';
-import { take } from 'rxjs/operators';
 import { FindListOptions } from '../core/data/request.models';
+import { PageInfo } from '../core/shared/page-info.model';
 
 describe('CommunityListService', () => {
   let store: StoreMock<AppState>;
@@ -210,13 +208,18 @@ describe('CommunityListService', () => {
       let flatNodeList;
       describe('None expanded: should return list containing only flatnodes of the test top communities page 1 and 2', () => {
         let findTopSpy;
-        beforeEach(() => {
+        beforeEach((done) => {
           findTopSpy = spyOn(communityDataServiceStub, 'findTop').and.callThrough();
-          service.getNextPageTopCommunities();
 
-          const sub = service.loadCommunities(null)
-            .subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+          service.loadCommunities({
+            currentPage: 2,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, null)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('flatnode list should contain just flatnodes of top community list page 1 and 2', () => {
           expect(findTopSpy).toHaveBeenCalled();
@@ -236,10 +239,16 @@ describe('CommunityListService', () => {
     describe('should transform all communities in a list of flatnodes with possible subcoms and collections as subflatnodes if they\'re expanded', () => {
       let flatNodeList;
       describe('None expanded: should return list containing only flatnodes of the test top communities', () => {
-        beforeEach(() => {
-          const sub = service.loadCommunities(null)
-            .pipe(take(1)).subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+        beforeEach((done) => {
+          service.loadCommunities({
+            currentPage: 1,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, null)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('length of flatnode list should be as big as top community list', () => {
           expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length);
@@ -256,7 +265,7 @@ describe('CommunityListService', () => {
         });
       });
       describe('All top expanded, all page 1: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
-        beforeEach(() => {
+        beforeEach((done) => {
           const expandedNodes = [];
           mockListOfTopCommunitiesPage1.map((community: Community) => {
             const communityFlatNode = toFlatNode(community, observableOf(true), 0, true, null);
@@ -264,9 +273,15 @@ describe('CommunityListService', () => {
             communityFlatNode.currentCommunityPage = 1;
             expandedNodes.push(communityFlatNode);
           });
-          const sub = service.loadCommunities(expandedNodes)
-            .pipe(take(1)).subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+          service.loadCommunities({
+            currentPage: 1,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, expandedNodes)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('length of flatnode list should be as big as top community list and size of its possible page-limited children', () => {
           expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockSubcommunities1Page1.length + mockSubcommunities1Page1.length);
@@ -281,14 +296,20 @@ describe('CommunityListService', () => {
         });
       });
       describe('Just first top comm expanded, all page 1: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
-        beforeEach(() => {
+        beforeEach((done) => {
           const communityFlatNode = toFlatNode(mockListOfTopCommunitiesPage1[0], observableOf(true), 0, true, null);
           communityFlatNode.currentCollectionPage = 1;
           communityFlatNode.currentCommunityPage = 1;
           const expandedNodes = [communityFlatNode];
-          const sub = service.loadCommunities(expandedNodes)
-            .pipe(take(1)).subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+          service.loadCommunities({
+            currentPage: 1,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, expandedNodes)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('length of flatnode list should be as big as top community list and size of page-limited children of first top community', () => {
           expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockSubcommunities1Page1.length);
@@ -300,14 +321,20 @@ describe('CommunityListService', () => {
         });
       });
       describe('Just second top comm expanded, collections at page 2: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
-        beforeEach(() => {
+        beforeEach((done) => {
           const communityFlatNode = toFlatNode(mockListOfTopCommunitiesPage1[1], observableOf(true), 0, true, null);
           communityFlatNode.currentCollectionPage = 2;
           communityFlatNode.currentCommunityPage = 1;
           const expandedNodes = [communityFlatNode];
-          const sub = service.loadCommunities(expandedNodes)
-            .pipe(take(1)).subscribe((value) => flatNodeList = value);
-          sub.unsubscribe();
+          service.loadCommunities({
+            currentPage: 1,
+            sort: new SortOptions('dc.title', SortDirection.ASC)
+          }, expandedNodes)
+            .pipe(take(1))
+            .subscribe((value) => {
+              flatNodeList = value;
+              done();
+            });
         });
         it('length of flatnode list should be as big as top community list and size of page-limited children of second top community', () => {
           expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockCollectionsPage1.length + mockCollectionsPage2.length);
@@ -333,10 +360,13 @@ describe('CommunityListService', () => {
         });
         let flatNodeList;
         describe('None expanded: should return list containing only flatnodes of the communities in the test list', () => {
-          beforeEach(() => {
-            const sub = service.transformListOfCommunities(new PaginatedList(new PageInfo(), listOfCommunities), 0, null, null)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+          beforeEach((done) => {
+            service.transformListOfCommunities(new PaginatedList(new PageInfo(), listOfCommunities), 0, null, null)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('length of flatnode list should be as big as community test list', () => {
             expect(flatNodeList.length).toEqual(listOfCommunities.length);
@@ -353,7 +383,7 @@ describe('CommunityListService', () => {
           });
         });
         describe('All top expanded, all page 1: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
-          beforeEach(() => {
+          beforeEach((done) => {
             const expandedNodes = [];
             listOfCommunities.map((community: Community) => {
               const communityFlatNode = toFlatNode(community, observableOf(true), 0, true, null);
@@ -361,9 +391,12 @@ describe('CommunityListService', () => {
               communityFlatNode.currentCommunityPage = 1;
               expandedNodes.push(communityFlatNode);
             });
-            const sub = service.transformListOfCommunities(new PaginatedList(new PageInfo(), listOfCommunities), 0, null, expandedNodes)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+            service.transformListOfCommunities(new PaginatedList(new PageInfo(), listOfCommunities), 0, null, expandedNodes)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('length of flatnode list should be as big as community test list and size of its possible children', () => {
             expect(flatNodeList.length).toEqual(listOfCommunities.length + mockSubcommunities1Page1.length + mockSubcommunities1Page1.length);
@@ -397,10 +430,13 @@ describe('CommunityListService', () => {
         });
         let flatNodeList;
         describe('should return list containing only flatnode corresponding to that community', () => {
-          beforeEach(() => {
-            const sub = service.transformCommunity(communityWithNoSubcomsOrColls, 0, null, null)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+          beforeEach((done) => {
+            service.transformCommunity(communityWithNoSubcomsOrColls, 0, null, null)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('length of flatnode list should be 1', () => {
             expect(flatNodeList.length).toEqual(1);
@@ -426,10 +462,14 @@ describe('CommunityListService', () => {
         });
         let flatNodeList;
         describe('should return list containing only flatnode corresponding to that community', () => {
-          beforeAll(() => {
-            const sub = service.transformCommunity(communityWithSubcoms, 0, null, null)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+          beforeAll((done) => {
+            service.transformCommunity(communityWithSubcoms, 0, null, null)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
+
           });
           it('length of flatnode list should be 1', () => {
             expect(flatNodeList.length).toEqual(1);
@@ -455,14 +495,17 @@ describe('CommunityListService', () => {
             }
           });
           let flatNodeList;
-          beforeEach(() => {
+          beforeEach((done) => {
             const communityFlatNode = toFlatNode(communityWithSubcoms, observableOf(true), 0, true, null);
             communityFlatNode.currentCollectionPage = 1;
             communityFlatNode.currentCommunityPage = 1;
             const expandedNodes = [communityFlatNode];
-            const sub = service.transformCommunity(communityWithSubcoms, 0, null, expandedNodes)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+            service.transformCommunity(communityWithSubcoms, 0, null, expandedNodes)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('list of flatnodes is length is  1 + nrOfSubcoms & first flatnode is of expanded test community', () => {
             expect(flatNodeList.length).toEqual(1 + mockSubcommunities1Page1.length);
@@ -485,7 +528,7 @@ describe('CommunityListService', () => {
         describe('should return list containing flatnodes of that community, its collections of the first two pages', () => {
           let communityWithCollections;
           let flatNodeList;
-          beforeEach(() => {
+          beforeEach((done) => {
             communityWithCollections = Object.assign(new Community(), {
               id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
               uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
@@ -500,9 +543,12 @@ describe('CommunityListService', () => {
             communityFlatNode.currentCollectionPage = 2;
             communityFlatNode.currentCommunityPage = 1;
             const expandedNodes = [communityFlatNode];
-            const sub = service.transformCommunity(communityWithCollections, 0, null, expandedNodes)
-              .pipe(take(1)).subscribe((value) => flatNodeList = value);
-            sub.unsubscribe();
+            service.transformCommunity(communityWithCollections, 0, null, expandedNodes)
+              .pipe(take(1))
+              .subscribe((value) => {
+                flatNodeList = value;
+                done();
+              });
           });
           it('list of flatnodes is length is  1 + nrOfCollections & first flatnode is of expanded test community', () => {
             expect(flatNodeList.length).toEqual(1 + mockCollectionsPage1.length + mockCollectionsPage2.length);
@@ -533,7 +579,7 @@ describe('CommunityListService', () => {
 
   describe('getIsExpandable', () => {
     describe('should return true', () => {
-      it('if community has subcommunities', () => {
+      it('if community has subcommunities', (done) => {
         const communityWithSubcoms = Object.assign(new Community(), {
           id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
           uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
@@ -546,9 +592,10 @@ describe('CommunityListService', () => {
         });
         service.getIsExpandable(communityWithSubcoms).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(true);
+          done();
         });
       });
-      it('if community has collections', () => {
+      it('if community has collections', (done) => {
         const communityWithCollections = Object.assign(new Community(), {
           id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
           uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
@@ -561,11 +608,12 @@ describe('CommunityListService', () => {
         });
         service.getIsExpandable(communityWithCollections).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(true);
+          done();
         });
       });
     });
     describe('should return false', () => {
-      it('if community has neither subcommunities nor collections', () => {
+      it('if community has neither subcommunities nor collections', (done) => {
         const communityWithNoSubcomsOrColls = Object.assign(new Community(), {
           id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
           uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
@@ -578,6 +626,7 @@ describe('CommunityListService', () => {
         });
         service.getIsExpandable(communityWithNoSubcomsOrColls).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(false);
+          done();
         });
       });
     });
diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts
index be04887e71..a5c3506e3d 100644
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -4,11 +4,12 @@ import { combineLatest as observableCombineLatest } from 'rxjs/internal/observab
 import { Observable, of as observableOf } from 'rxjs';
 import { AppState } from '../app.reducer';
 import { CommunityDataService } from '../core/data/community-data.service';
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { catchError, filter, map, switchMap, take } from 'rxjs/operators';
+import { FindListOptions } from '../core/data/request.models';
+import { map, flatMap } from 'rxjs/operators';
 import { Community } from '../core/shared/community.model';
 import { Collection } from '../core/shared/collection.model';
+import { getSucceededRemoteData } from '../core/shared/operators';
+import { PageInfo } from '../core/shared/page-info.model';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { RemoteData } from '../core/data/remote-data';
 import { PaginatedList } from '../core/data/paginated-list';
@@ -46,8 +47,7 @@ export class ShowMoreFlatNode {
 // Helper method to combine an flatten an array of observables of flatNode arrays
 export const combineAndFlatten = (obsList: Array<Observable<FlatNode[]>>): Observable<FlatNode[]> =>
   observableCombineLatest(...obsList).pipe(
-    map((matrix: FlatNode[][]) =>
-      matrix.reduce((combinedList, currentList: FlatNode[]) => [...combinedList, ...currentList]))
+    map((matrix: any[][]) => [].concat(...matrix))
   );
 
 /**
@@ -99,6 +99,8 @@ const communityListStateSelector = (state: AppState) => state.communityList;
 const expandedNodesSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.expandedNodes);
 const loadingNodeSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.loadingNode);
 
+export const MAX_COMCOLS_PER_PAGE = 50;
+
 /**
  * Service class for the community list, responsible for the creating of the flat list used by communityList dataSource
  *  and connection to the store to retrieve and save the state of the community list
@@ -107,26 +109,8 @@ const loadingNodeSelector = createSelector(communityListStateSelector, (communit
 @Injectable()
 export class CommunityListService {
 
-  // page-limited list of top-level communities
-  payloads$: Array<Observable<PaginatedList<Community>>>;
-
-  topCommunitiesConfig: PaginationComponentOptions;
-  topCommunitiesSortConfig: SortOptions;
-
-  maxSubCommunitiesPerPage: number;
-  maxCollectionsPerPage: number;
-
   constructor(private communityDataService: CommunityDataService, private collectionDataService: CollectionDataService,
               private store: Store<any>) {
-    this.topCommunitiesConfig = new PaginationComponentOptions();
-    this.topCommunitiesConfig.id = 'top-level-pagination';
-    this.topCommunitiesConfig.pageSize = 10;
-    this.topCommunitiesConfig.currentPage = 1;
-    this.topCommunitiesSortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    this.initTopCommunityList();
-
-    this.maxSubCommunitiesPerPage = 3;
-    this.maxCollectionsPerPage = 3;
   }
 
   saveCommunityListStateToStore(expandedNodes: FlatNode[], loadingNode: FlatNode): void {
@@ -141,57 +125,46 @@ export class CommunityListService {
     return this.store.select(loadingNodeSelector);
   }
 
-  /**
-   * Increases the payload so it contains the next page of top level communities
-   */
-  getNextPageTopCommunities(): void {
-    this.topCommunitiesConfig.currentPage = this.topCommunitiesConfig.currentPage + 1;
-    this.payloads$ = [...this.payloads$, this.communityDataService.findTop({
-      currentPage: this.topCommunitiesConfig.currentPage,
-      elementsPerPage: this.topCommunitiesConfig.pageSize,
-      sort: {
-        field: this.topCommunitiesSortConfig.field,
-        direction: this.topCommunitiesSortConfig.direction
-      }
-    }).pipe(
-      take(1),
-      map((results) => results.payload),
-    )];
-  }
-
   /**
    * Gets all top communities, limited by page, and transforms this in a list of flatNodes.
    * @param expandedNodes     List of expanded nodes; if a node is not expanded its subCommunities and collections need
    *                            not be added to the list
    */
-  loadCommunities(expandedNodes: FlatNode[]): Observable<FlatNode[]> {
-    const res = this.payloads$.map((payload) => {
-      return payload.pipe(
-        take(1),
-        switchMap((result: PaginatedList<Community>) => {
-          return this.transformListOfCommunities(result, 0, null, expandedNodes);
-        }),
-        catchError(() => observableOf([])),
-      );
-    });
-    return combineAndFlatten(res);
+  loadCommunities(findOptions: FindListOptions, expandedNodes: FlatNode[]): Observable<FlatNode[]> {
+    const currentPage = findOptions.currentPage;
+    const topCommunities = [];
+    for (let i = 1; i <= currentPage; i++) {
+      const pagination: FindListOptions = Object.assign({}, findOptions, { currentPage: i });
+      topCommunities.push(this.getTopCommunities(pagination));
+    }
+    const topComs$ = observableCombineLatest(...topCommunities).pipe(
+      map((coms: Array<PaginatedList<Community>>) => {
+        const newPages: Community[][] = coms.map((unit: PaginatedList<Community>) => unit.page);
+        const newPage: Community[] = [].concat(...newPages);
+        let newPageInfo = new PageInfo();
+        if (coms && coms.length > 0) {
+          newPageInfo = Object.assign({}, coms[0].pageInfo, { currentPage })
+        }
+        return new PaginatedList(newPageInfo, newPage);
+      })
+    );
+    return topComs$.pipe(flatMap((topComs: PaginatedList<Community>) => this.transformListOfCommunities(topComs, 0, null, expandedNodes)));
   };
 
   /**
    * Puts the initial top level communities in a list to be called upon
    */
-  private initTopCommunityList(): void {
-    this.payloads$ = [this.communityDataService.findTop({
-      currentPage: this.topCommunitiesConfig.currentPage,
-      elementsPerPage: this.topCommunitiesConfig.pageSize,
+  private getTopCommunities(options: FindListOptions): Observable<PaginatedList<Community>> {
+    return this.communityDataService.findTop({
+      currentPage: options.currentPage,
+      elementsPerPage: MAX_COMCOLS_PER_PAGE,
       sort: {
-        field: this.topCommunitiesSortConfig.field,
-        direction: this.topCommunitiesSortConfig.direction
+        field: options.sort.field,
+        direction: options.sort.direction
       }
     }).pipe(
-      take(1),
       map((results) => results.payload),
-    )];
+    );
   }
 
   /**
@@ -206,16 +179,15 @@ export class CommunityListService {
                                     parent: FlatNode,
                                     expandedNodes: FlatNode[]): Observable<FlatNode[]> {
     if (isNotEmpty(listOfPaginatedCommunities.page)) {
-      let currentPage = this.topCommunitiesConfig.currentPage;
+      let currentPage = listOfPaginatedCommunities.currentPage;
       if (isNotEmpty(parent)) {
         currentPage = expandedNodes.find((node: FlatNode) => node.id === parent.id).currentCommunityPage;
       }
-      const isNotAllCommunities = (listOfPaginatedCommunities.totalElements > (listOfPaginatedCommunities.elementsPerPage * currentPage));
       let obsList = listOfPaginatedCommunities.page
         .map((community: Community) => {
           return this.transformCommunity(community, level, parent, expandedNodes)
         });
-      if (isNotAllCommunities && listOfPaginatedCommunities.currentPage > currentPage) {
+      if (currentPage < listOfPaginatedCommunities.totalPages && currentPage === listOfPaginatedCommunities.currentPage) {
         obsList = [...obsList, observableOf([showMoreFlatNode('community', level, parent)])];
       }
 
@@ -252,13 +224,12 @@ export class CommunityListService {
       let subcoms = [];
       for (let i = 1; i <= currentCommunityPage; i++) {
         const nextSetOfSubcommunitiesPage = this.communityDataService.findByParent(community.uuid, {
-          elementsPerPage: this.maxSubCommunitiesPerPage,
+          elementsPerPage: MAX_COMCOLS_PER_PAGE,
           currentPage: i
         })
           .pipe(
-            filter((rd: RemoteData<PaginatedList<Community>>) => rd.hasSucceeded),
-            take(1),
-            switchMap((rd: RemoteData<PaginatedList<Community>>) =>
+            getSucceededRemoteData(),
+            flatMap((rd: RemoteData<PaginatedList<Community>>) =>
               this.transformListOfCommunities(rd.payload, level + 1, communityFlatNode, expandedNodes))
           );
 
@@ -271,16 +242,15 @@ export class CommunityListService {
       let collections = [];
       for (let i = 1; i <= currentCollectionPage; i++) {
         const nextSetOfCollectionsPage = this.collectionDataService.findByParent(community.uuid, {
-          elementsPerPage: this.maxCollectionsPerPage,
+          elementsPerPage: MAX_COMCOLS_PER_PAGE,
           currentPage: i
         })
           .pipe(
-            filter((rd: RemoteData<PaginatedList<Collection>>) => rd.hasSucceeded),
-            take(1),
+            getSucceededRemoteData(),
             map((rd: RemoteData<PaginatedList<Collection>>) => {
               let nodes = rd.payload.page
                 .map((collection: Collection) => toFlatNode(collection, observableOf(false), level + 1, false, communityFlatNode));
-              if ((rd.payload.elementsPerPage * currentCollectionPage) < rd.payload.totalElements && rd.payload.currentPage > currentCollectionPage) {
+              if (currentCollectionPage < rd.payload.totalPages && currentCollectionPage === rd.payload.currentPage) {
                 nodes = [...nodes, showMoreFlatNode('collection', level + 1, communityFlatNode)];
               }
               return nodes;
@@ -305,21 +275,18 @@ export class CommunityListService {
     let hasColls$: Observable<boolean>;
     hasSubcoms$ = this.communityDataService.findByParent(community.uuid, { elementsPerPage: 1 })
       .pipe(
-        filter((rd: RemoteData<PaginatedList<Community>>) => rd.hasSucceeded),
-        take(1),
+        getSucceededRemoteData(),
         map((results) => results.payload.totalElements > 0),
       );
 
     hasColls$ = this.collectionDataService.findByParent(community.uuid, { elementsPerPage: 1 })
       .pipe(
-        filter((rd: RemoteData<PaginatedList<Collection>>) => rd.hasSucceeded),
-        take(1),
+        getSucceededRemoteData(),
         map((results) => results.payload.totalElements > 0),
       );
 
     let hasChildren$: Observable<boolean>;
     hasChildren$ = observableCombineLatest(hasSubcoms$, hasColls$).pipe(
-      take(1),
       map(([hasSubcoms, hasColls]: [boolean, boolean]) => {
         if (hasSubcoms || hasColls) {
           return true;
diff --git a/src/app/community-list-page/community-list/community-list.component.spec.ts b/src/app/community-list-page/community-list/community-list.component.spec.ts
index a91c5fa057..ef9e89ff1b 100644
--- a/src/app/community-list-page/community-list/community-list.component.spec.ts
+++ b/src/app/community-list-page/community-list/community-list.component.spec.ts
@@ -114,15 +114,9 @@ describe('CommunityListComponent', () => {
 
   beforeEach(async(() => {
     communityListServiceStub = {
-      topPageSize: 2,
-      topCurrentPage: 1,
-      collectionPageSize: 2,
-      subcommunityPageSize: 2,
+      pageSize: 2,
       expandedNodes: [],
       loadingNode: null,
-      getNextPageTopCommunities() {
-        this.topCurrentPage++;
-      },
       getLoadingNodeFromStore() {
         return observableOf(this.loadingNode);
       },
@@ -133,12 +127,12 @@ describe('CommunityListComponent', () => {
         this.expandedNodes = expandedNodes;
         this.loadingNode = loadingNode;
       },
-      loadCommunities(expandedNodes) {
+      loadCommunities(options, expandedNodes) {
         let flatnodes;
         let showMoreTopComNode = false;
         flatnodes = [...mockTopFlatnodesUnexpanded];
-        const currentPage = this.topCurrentPage;
-        const elementsPerPage = this.topPageSize;
+        const currentPage = options.currentPage;
+        const elementsPerPage = this.pageSize;
         let endPageIndex = (currentPage * elementsPerPage);
         if (endPageIndex >= flatnodes.length) {
           endPageIndex = flatnodes.length;
@@ -171,14 +165,14 @@ describe('CommunityListComponent', () => {
                   collFlatnodes = [...collFlatnodes, toFlatNode(coll, observableOf(false), topNode.level + 1, false, topNode)];
                 });
                 if (isNotEmpty(subComFlatnodes)) {
-                  const endSubComIndex = this.subcommunityPageSize * expandedParent.currentCommunityPage;
+                  const endSubComIndex = this.pageSize * expandedParent.currentCommunityPage;
                   flatnodes = [...flatnodes, ...subComFlatnodes.slice(0, endSubComIndex)];
                   if (subComFlatnodes.length > endSubComIndex) {
                     flatnodes = [...flatnodes, showMoreFlatNode('community', topNode.level + 1, expandedParent)];
                   }
                 }
                 if (isNotEmpty(collFlatnodes)) {
-                  const endColIndex = this.collectionPageSize * expandedParent.currentCollectionPage;
+                  const endColIndex = this.pageSize * expandedParent.currentCollectionPage;
                   flatnodes = [...flatnodes, ...collFlatnodes.slice(0, endColIndex)];
                   if (collFlatnodes.length > endColIndex) {
                     flatnodes = [...flatnodes, showMoreFlatNode('collection', topNode.level + 1, expandedParent)];
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
index ddcd49cd1c..be96ff1a0a 100644
--- a/src/app/community-list-page/community-list/community-list.component.ts
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -1,5 +1,7 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
 import { take } from 'rxjs/operators';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../core/data/request.models';
 import { CommunityListService, FlatNode } from '../community-list-service';
 import { CommunityListDatasource } from '../community-list-datasource';
 import { FlatTreeControl } from '@angular/cdk/tree';
@@ -27,17 +29,24 @@ export class CommunityListComponent implements OnInit, OnDestroy {
 
   dataSource: CommunityListDatasource;
 
-  constructor(private communityListService: CommunityListService) {
+  paginationConfig: FindListOptions;
+
+  constructor(private communityListService: CommunityListService,
+              private zone: NgZone) {
+    this.paginationConfig = new FindListOptions();
+    this.paginationConfig.elementsPerPage = 2;
+    this.paginationConfig.currentPage = 1;
+    this.paginationConfig.sort = new SortOptions('dc.title', SortDirection.ASC);
   }
 
   ngOnInit() {
-    this.dataSource = new CommunityListDatasource(this.communityListService);
+    this.dataSource = new CommunityListDatasource(this.communityListService, this.zone);
     this.communityListService.getLoadingNodeFromStore().pipe(take(1)).subscribe((result) => {
       this.loadingNode = result;
     });
     this.communityListService.getExpandedNodesFromStore().pipe(take(1)).subscribe((result) => {
       this.expandedNodes = [...result];
-      this.dataSource.loadCommunities(this.expandedNodes);
+      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     });
   }
 
@@ -74,7 +83,7 @@ export class CommunityListComponent implements OnInit, OnDestroy {
         node.currentCommunityPage = 1;
       }
     }
-    this.dataSource.loadCommunities(this.expandedNodes);
+    this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
   }
 
   /**
@@ -94,10 +103,10 @@ export class CommunityListComponent implements OnInit, OnDestroy {
         const parentNodeInExpandedNodes = this.expandedNodes.find((node2: FlatNode) => node.parent.id === node2.id);
         parentNodeInExpandedNodes.currentCommunityPage++;
       }
-      this.dataSource.loadCommunities(this.expandedNodes);
+      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     } else {
-      this.communityListService.getNextPageTopCommunities();
-      this.dataSource.loadCommunities(this.expandedNodes);
+      this.paginationConfig.currentPage++;
+      this.dataSource.loadCommunities(this.paginationConfig, this.expandedNodes);
     }
   }
 
diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 465fb69dd2..93f55389f9 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -1,12 +1,18 @@
 import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
-import { Inject, Injectable } from '@angular/core';
+import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestService } from '../data/request.service';
-import { GlobalConfig } from '../../../config/global-config.interface';
 import { isNotEmpty } from '../../shared/empty.util';
-import { AuthGetRequest, AuthPostRequest, GetRequest, PostRequest, RestRequest } from '../data/request.models';
-import { AuthStatusResponse, ErrorResponse } from '../cache/response.models';
+import {
+  AuthGetRequest,
+  AuthPostRequest,
+  GetRequest,
+  PostRequest,
+  RestRequest,
+  TokenPostRequest
+} from '../data/request.models';
+import { AuthStatusResponse, ErrorResponse, TokenResponse } from '../cache/response.models';
 import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
 import { getResponseFromEntry } from '../shared/operators';
 import { HttpClient } from '@angular/common/http';
@@ -15,6 +21,7 @@ import { HttpClient } from '@angular/common/http';
 export class AuthRequestService {
   protected linkName = 'authn';
   protected browseEndpoint = '';
+  protected shortlivedtokensEndpoint = 'shortlivedtokens';
 
   constructor(protected halService: HALEndpointService,
               protected requestService: RequestService,
@@ -67,4 +74,19 @@ export class AuthRequestService {
       mergeMap((request: GetRequest) => this.fetchRequest(request)),
       distinctUntilChanged());
   }
+
+  /**
+   * Send a POST request to retrieve a short-lived token which provides download access of restricted files
+   */
+  public getShortlivedToken(): Observable<string> {
+    return this.halService.getEndpoint(`${this.linkName}/${this.shortlivedtokensEndpoint}`).pipe(
+      filter((href: string) => isNotEmpty(href)),
+      distinctUntilChanged(),
+      map((endpointURL: string) => new TokenPostRequest(this.requestService.generateRequestId(), endpointURL)),
+      tap((request: PostRequest) => this.requestService.configure(request)),
+      switchMap((request: PostRequest) => this.requestService.getByUUID(request.uuid)),
+      getResponseFromEntry(),
+      map((response: TokenResponse) => response.token)
+    );
+  }
 }
diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts
index 9237c30db9..be4bdf2a26 100644
--- a/src/app/core/auth/auth.actions.ts
+++ b/src/app/core/auth/auth.actions.ts
@@ -3,7 +3,6 @@ import { Action } from '@ngrx/store';
 // import type function
 import { type } from '../../shared/ngrx/type';
 // import models
-import { EPerson } from '../eperson/models/eperson.model';
 import { AuthTokenInfo } from './models/auth-token-info.model';
 import { AuthMethod } from './models/auth.method';
 import { AuthStatus } from './models/auth-status.model';
@@ -31,9 +30,6 @@ export const AuthActionTypes = {
   LOG_OUT: type('dspace/auth/LOG_OUT'),
   LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'),
   LOG_OUT_SUCCESS: type('dspace/auth/LOG_OUT_SUCCESS'),
-  REGISTRATION: type('dspace/auth/REGISTRATION'),
-  REGISTRATION_ERROR: type('dspace/auth/REGISTRATION_ERROR'),
-  REGISTRATION_SUCCESS: type('dspace/auth/REGISTRATION_SUCCESS'),
   SET_REDIRECT_URL: type('dspace/auth/SET_REDIRECT_URL'),
   RETRIEVE_AUTHENTICATED_EPERSON: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON'),
   RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS'),
@@ -263,48 +259,6 @@ export class RetrieveTokenAction implements Action {
   public type: string = AuthActionTypes.RETRIEVE_TOKEN;
 }
 
-/**
- * Sign up.
- * @class RegistrationAction
- * @implements {Action}
- */
-export class RegistrationAction implements Action {
-  public type: string = AuthActionTypes.REGISTRATION;
-  payload: EPerson;
-
-  constructor(user: EPerson) {
-    this.payload = user;
-  }
-}
-
-/**
- * Sign up error.
- * @class RegistrationErrorAction
- * @implements {Action}
- */
-export class RegistrationErrorAction implements Action {
-  public type: string = AuthActionTypes.REGISTRATION_ERROR;
-  payload: Error;
-
-  constructor(payload: Error) {
-    this.payload = payload;
-  }
-}
-
-/**
- * Sign up success.
- * @class RegistrationSuccessAction
- * @implements {Action}
- */
-export class RegistrationSuccessAction implements Action {
-  public type: string = AuthActionTypes.REGISTRATION_SUCCESS;
-  payload: EPerson;
-
-  constructor(user: EPerson) {
-    this.payload = user;
-  }
-}
-
 /**
  * Add uthentication message.
  * @class AddAuthenticationMessageAction
@@ -439,9 +393,6 @@ export type AuthActions
   | CheckAuthenticationTokenCookieAction
   | RedirectWhenAuthenticationIsRequiredAction
   | RedirectWhenTokenExpiredAction
-  | RegistrationAction
-  | RegistrationErrorAction
-  | RegistrationSuccessAction
   | AddAuthenticationMessageAction
   | RefreshTokenAction
   | RefreshTokenErrorAction
diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts
index c08615ecc9..79fe385c6d 100644
--- a/src/app/core/auth/auth.effects.spec.ts
+++ b/src/app/core/auth/auth.effects.spec.ts
@@ -150,7 +150,8 @@ describe('AuthEffects', () => {
 
   describe('authenticatedSuccess$', () => {
 
-    it('should return a RETRIEVE_AUTHENTICATED_EPERSON action in response to a AUTHENTICATED_SUCCESS action', () => {
+    it('should return a RETRIEVE_AUTHENTICATED_EPERSON action in response to a AUTHENTICATED_SUCCESS action', (done) => {
+      spyOn((authEffects as any).authService, 'storeToken');
       actions = hot('--a-', {
         a: {
           type: AuthActionTypes.AUTHENTICATED_SUCCESS, payload: {
@@ -163,8 +164,14 @@ describe('AuthEffects', () => {
 
       const expected = cold('--b-', { b: new RetrieveAuthenticatedEpersonAction(EPersonMock._links.self.href) });
 
+      authEffects.authenticatedSuccess$.subscribe(() => {
+        expect(authServiceStub.storeToken).toHaveBeenCalledWith(token);
+      });
+
       expect(authEffects.authenticatedSuccess$).toBeObservable(expected);
+      done();
     });
+
   });
 
   describe('checkToken$', () => {
diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index c6d447961a..37ef3b79bc 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 
 import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { catchError, debounceTime, filter, map, switchMap, take, tap } from 'rxjs/operators';
+import { catchError, filter, map, switchMap, take, tap } from 'rxjs/operators';
 // import @ngrx
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Action, select, Store } from '@ngrx/store';
@@ -30,9 +30,6 @@ import {
   RefreshTokenAction,
   RefreshTokenErrorAction,
   RefreshTokenSuccessAction,
-  RegistrationAction,
-  RegistrationErrorAction,
-  RegistrationSuccessAction,
   RetrieveAuthenticatedEpersonAction,
   RetrieveAuthenticatedEpersonErrorAction,
   RetrieveAuthenticatedEpersonSuccessAction,
@@ -65,7 +62,6 @@ export class AuthEffects {
   @Effect()
   public authenticateSuccess$: Observable<Action> = this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATE_SUCCESS),
-    tap((action: AuthenticationSuccessAction) => this.authService.storeToken(action.payload)),
     map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload))
   );
 
@@ -82,6 +78,7 @@ export class AuthEffects {
   @Effect()
   public authenticatedSuccess$: Observable<Action> = this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATED_SUCCESS),
+    tap((action: AuthenticatedSuccessAction) => this.authService.storeToken(action.payload.authToken)),
     map((action: AuthenticatedSuccessAction) => new RetrieveAuthenticatedEpersonAction(action.payload.userHref))
   );
 
@@ -136,18 +133,6 @@ export class AuthEffects {
     })
   );
 
-  @Effect()
-  public createUser$: Observable<Action> = this.actions$.pipe(
-    ofType(AuthActionTypes.REGISTRATION),
-    debounceTime(500), // to remove when functionality is implemented
-    switchMap((action: RegistrationAction) => {
-      return this.authService.create(action.payload).pipe(
-        map((user: EPerson) => new RegistrationSuccessAction(user)),
-        catchError((error) => observableOf(new RegistrationErrorAction(error)))
-      );
-    })
-  );
-
   @Effect()
   public retrieveToken$: Observable<Action> = this.actions$.pipe(
     ofType(AuthActionTypes.RETRIEVE_TOKEN),
diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts
index 16990b35a8..34c8fe2b41 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -115,7 +115,6 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       });
 
     case AuthActionTypes.AUTHENTICATE_ERROR:
-    case AuthActionTypes.REGISTRATION_ERROR:
       return Object.assign({}, state, {
         authenticated: false,
         authToken: undefined,
@@ -157,18 +156,6 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         userId: undefined
       });
 
-    case AuthActionTypes.REGISTRATION:
-      return Object.assign({}, state, {
-        authenticated: false,
-        authToken: undefined,
-        error: undefined,
-        loading: true,
-        info: undefined
-      });
-
-    case AuthActionTypes.REGISTRATION_SUCCESS:
-      return state;
-
     case AuthActionTypes.REFRESH_TOKEN:
       return Object.assign({}, state, {
         refreshing: true,
diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts
index 3b6fae4dd1..a15d604cc4 100644
--- a/src/app/core/auth/auth.service.spec.ts
+++ b/src/app/core/auth/auth.service.spec.ts
@@ -1,17 +1,14 @@
 import { async, inject, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import { ActivatedRoute, Router } from '@angular/router';
-
 import { Store, StoreModule } from '@ngrx/store';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
 import { of as observableOf } from 'rxjs';
-
 import { authReducer, AuthState } from './auth.reducer';
 import { NativeWindowRef, NativeWindowService } from '../services/window.service';
 import { AuthService, IMPERSONATING_COOKIE } from './auth.service';
 import { RouterStub } from '../../shared/testing/router.stub';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-
 import { CookieService } from '../services/cookie.service';
 import { AuthRequestServiceStub } from '../../shared/testing/auth-request-service.stub';
 import { AuthRequestService } from './auth-request.service';
@@ -49,6 +46,7 @@ describe('AuthService test', () => {
   let storage: CookieService;
   let token: AuthTokenInfo;
   let authenticatedState;
+  let unAuthenticatedState;
   let linkService;
 
   function init() {
@@ -67,6 +65,13 @@ describe('AuthService test', () => {
       authToken: token,
       user: EPersonMock
     };
+    unAuthenticatedState = {
+      authenticated: false,
+      loaded: true,
+      loading: false,
+      authToken: undefined,
+      user: undefined
+    };
     authRequest = new AuthRequestServiceStub();
     routeStub = new ActivatedRouteStub();
     linkService = {
@@ -214,6 +219,12 @@ describe('AuthService test', () => {
       });
     });
 
+    it('should return the shortlived token when user is logged in', () => {
+      authService.getShortlivedToken().subscribe((shortlivedToken: string) => {
+        expect(shortlivedToken).toEqual(authRequest.mockShortLivedToken);
+      });
+    });
+
     it('should return token object when it is valid', () => {
       authService.hasValidAuthenticationToken().subscribe((tokenState: AuthTokenInfo) => {
         expect(tokenState).toBe(token);
@@ -448,4 +459,44 @@ describe('AuthService test', () => {
       });
     });
   });
+
+  describe('when user is not logged in', () => {
+    beforeEach(async(() => {
+      init();
+      TestBed.configureTestingModule({
+        imports: [
+          StoreModule.forRoot({ authReducer }, {
+            runtimeChecks: {
+              strictStateImmutability: false,
+              strictActionImmutability: false
+            }
+          })
+        ],
+        providers: [
+          { provide: AuthRequestService, useValue: authRequest },
+          { provide: REQUEST, useValue: {} },
+          { provide: Router, useValue: routerStub },
+          { provide: RouteService, useValue: routeServiceStub },
+          { provide: RemoteDataBuildService, useValue: linkService },
+          CookieService,
+          AuthService
+        ]
+      }).compileComponents();
+    }));
+
+    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService) => {
+      store
+        .subscribe((state) => {
+          (state as any).core = Object.create({});
+          (state as any).core.auth = unAuthenticatedState;
+        });
+      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store);
+    }));
+
+    it('should return null for the shortlived token', () => {
+      authService.getShortlivedToken().subscribe((shortlivedToken: string) => {
+        expect(shortlivedToken).toBeNull();
+      });
+    });
+  });
 });
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 588d9e2675..fe9828bc73 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -270,18 +270,6 @@ export class AuthService {
     return observableOf(authMethods);
   }
 
-  /**
-   * Create a new user
-   * @returns {User}
-   */
-  public create(user: EPerson): Observable<EPerson> {
-    // Normally you would do an HTTP request to POST the user
-    // details and then return the new user object
-    // but, let's just return the new user for this example.
-    // this._authenticated = true;
-    return observableOf(user);
-  }
-
   /**
    * End session
    * @returns {Observable<boolean>}
@@ -546,4 +534,14 @@ export class AuthService {
     return this.getImpersonateID() === epersonId;
   }
 
+  /**
+   * Get a short-lived token for appending to download urls of restricted files
+   * Returns null if the user isn't authenticated
+   */
+  getShortlivedToken(): Observable<string> {
+    return this.isAuthenticated().pipe(
+      switchMap((authenticated) => authenticated ? this.authRequestService.getShortlivedToken() : observableOf(null))
+    );
+  }
+
 }
diff --git a/src/app/core/auth/token-response-parsing.service.spec.ts b/src/app/core/auth/token-response-parsing.service.spec.ts
new file mode 100644
index 0000000000..35927708f6
--- /dev/null
+++ b/src/app/core/auth/token-response-parsing.service.spec.ts
@@ -0,0 +1,45 @@
+import { TokenResponseParsingService } from './token-response-parsing.service';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { TokenResponse } from '../cache/response.models';
+
+describe('TokenResponseParsingService', () => {
+  let service: TokenResponseParsingService;
+
+  beforeEach(() => {
+    service = new TokenResponseParsingService();
+  });
+
+  describe('parse', () => {
+    it('should return a TokenResponse containing the token', () => {
+      const data = {
+        payload: {
+          token: 'valid-token'
+        },
+        statusCode: 200,
+        statusText: 'OK'
+      } as DSpaceRESTV2Response;
+      const expected = new TokenResponse(data.payload.token, true, 200, 'OK');
+      expect(service.parse(undefined, data)).toEqual(expected);
+    });
+
+    it('should return an empty TokenResponse when payload doesn\'t contain a token', () => {
+      const data = {
+        payload: {},
+        statusCode: 200,
+        statusText: 'OK'
+      } as DSpaceRESTV2Response;
+      const expected = new TokenResponse(null, false, 200, 'OK');
+      expect(service.parse(undefined, data)).toEqual(expected);
+    });
+
+    it('should return an error TokenResponse when the response failed', () => {
+      const data = {
+        payload: {},
+        statusCode: 400,
+        statusText: 'BAD REQUEST'
+      } as DSpaceRESTV2Response;
+      const expected = new TokenResponse(null, false, 400, 'BAD REQUEST');
+      expect(service.parse(undefined, data)).toEqual(expected);
+    });
+  });
+});
diff --git a/src/app/core/auth/token-response-parsing.service.ts b/src/app/core/auth/token-response-parsing.service.ts
new file mode 100644
index 0000000000..a1b1e23aa4
--- /dev/null
+++ b/src/app/core/auth/token-response-parsing.service.ts
@@ -0,0 +1,23 @@
+import { ResponseParsingService } from '../data/parsing.service';
+import { RestRequest } from '../data/request.models';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RestResponse, TokenResponse } from '../cache/response.models';
+import { isNotEmpty } from '../../shared/empty.util';
+import { Injectable } from '@angular/core';
+
+@Injectable()
+/**
+ * A ResponseParsingService used to parse DSpaceRESTV2Response coming from the REST API to a token string
+ * wrapped in a TokenResponse
+ */
+export class TokenResponseParsingService implements ResponseParsingService {
+
+  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+    if (isNotEmpty(data.payload) && isNotEmpty(data.payload.token) && (data.statusCode === 200)) {
+      return new TokenResponse(data.payload.token, true, data.statusCode, data.statusText);
+    } else {
+      return new TokenResponse(null, false, data.statusCode, data.statusText)
+    }
+  }
+
+}
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
index d34d6d8a9b..6b640a9db0 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
@@ -1,21 +1,38 @@
 import { I18nBreadcrumbResolver } from './i18n-breadcrumb.resolver';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 describe('I18nBreadcrumbResolver', () => {
   describe('resolve', () => {
     let resolver: I18nBreadcrumbResolver;
     let i18nBreadcrumbService: any;
     let i18nKey: string;
-    let path: string;
+    let route: any;
+    let parentSegment;
+    let segment;
+    let expectedPath;
     beforeEach(() => {
       i18nKey = 'example.key';
-      path = 'rest.com/path/to/breadcrumb';
+      parentSegment = 'path';
+      segment = 'breadcrumb';
+      route = {
+        data: { breadcrumbKey: i18nKey },
+        routeConfig: {
+          path: segment
+        },
+        parent: {
+          routeConfig: {
+            path: parentSegment
+          }
+        } as any
+      };
+      expectedPath = new URLCombiner(parentSegment, segment).toString();
       i18nBreadcrumbService = {};
       resolver = new I18nBreadcrumbResolver(i18nBreadcrumbService);
     });
 
     it('should resolve the breadcrumb config', () => {
-      const resolvedConfig = resolver.resolve({ data: { breadcrumbKey: i18nKey }, url: [path] } as any, {} as any);
-      const expectedConfig = { provider: i18nBreadcrumbService, key: i18nKey, url: path };
+      const resolvedConfig = resolver.resolve(route, {} as any);
+      const expectedConfig = { provider: i18nBreadcrumbService, key: i18nKey, url: expectedPath };
       expect(resolvedConfig).toEqual(expectedConfig);
     });
 
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
index 1b8c5bcbd1..cce36f590a 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
@@ -3,6 +3,7 @@ import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
 import { I18nBreadcrumbsService } from './i18n-breadcrumbs.service';
 import { hasNoValue } from '../../shared/empty.util';
+import { currentPathFromSnapshot } from '../../shared/utils/route.utils';
 
 /**
  * The class that resolves a BreadcrumbConfig object with an i18n key string for a route
@@ -25,7 +26,7 @@ export class I18nBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>>
     if (hasNoValue(key)) {
       throw new Error('You provided an i18nBreadcrumbResolver for url \"' + route.url + '\" but no breadcrumbKey in the route\'s data')
     }
-    const fullPath = route.url.join('');
+    const fullPath = currentPathFromSnapshot(route);
     return { provider: this.breadcrumbService, key: key, url: fullPath };
   }
 }
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 88d1890de2..6c9f40888f 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -150,12 +150,7 @@ export class RemoteDataBuildService {
       filterSuccessfulResponses(),
       map((response: DSOSuccessResponse) => {
         if (hasValue((response as DSOSuccessResponse).pageInfo)) {
-          const resPageInfo = (response as DSOSuccessResponse).pageInfo;
-          if (isNotEmpty(resPageInfo) && resPageInfo.currentPage >= 0) {
-            return Object.assign({}, resPageInfo, { currentPage: resPageInfo.currentPage + 1 });
-          } else {
-            return resPageInfo;
-          }
+          return (response as DSOSuccessResponse).pageInfo;
         }
       })
     );
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index 3f46ecf647..5f19185d1c 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -6,15 +6,13 @@ import { ConfigObject } from '../config/models/config.model';
 import { FacetValue } from '../../shared/search/facet-value.model';
 import { SearchFilterConfig } from '../../shared/search/search-filter-config.model';
 import { IntegrationModel } from '../integration/models/integration.model';
-import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
-import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
-import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model';
 import { PaginatedList } from '../data/paginated-list';
 import { SubmissionObject } from '../submission/models/submission-object.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { MetadataField } from '../metadata/metadata-field.model';
 import { ContentSource } from '../shared/content-source.model';
+import { Registration } from '../shared/registration.model';
 
 /* tslint:disable:max-classes-per-file */
 export class RestResponse {
@@ -40,48 +38,6 @@ export class DSOSuccessResponse extends RestResponse {
   }
 }
 
-/**
- * A successful response containing a list of MetadataSchemas wrapped in a RegistryMetadataschemasResponse
- */
-export class RegistryMetadataschemasSuccessResponse extends RestResponse {
-  constructor(
-    public metadataschemasResponse: RegistryMetadataschemasResponse,
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
-/**
- * A successful response containing a list of MetadataFields wrapped in a RegistryMetadatafieldsResponse
- */
-export class RegistryMetadatafieldsSuccessResponse extends RestResponse {
-  constructor(
-    public metadatafieldsResponse: RegistryMetadatafieldsResponse,
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
-/**
- * A successful response containing a list of BitstreamFormats wrapped in a RegistryBitstreamformatsResponse
- */
-export class RegistryBitstreamformatsSuccessResponse extends RestResponse {
-  constructor(
-    public bitstreamformatsResponse: RegistryBitstreamformatsResponse,
-    public statusCode: number,
-    public statusText: string,
-    public pageInfo?: PageInfo
-  ) {
-    super(true, statusCode, statusText);
-  }
-}
-
 /**
  * A successful response containing exactly one MetadataSchema
  */
@@ -211,6 +167,20 @@ export class AuthStatusResponse extends RestResponse {
   }
 }
 
+/**
+ * A REST Response containing a token
+ */
+export class TokenResponse extends RestResponse {
+  constructor(
+    public token: string,
+    public isSuccessful: boolean,
+    public statusCode: number,
+    public statusText: string
+  ) {
+    super(isSuccessful, statusCode, statusText);
+  }
+}
+
 export class IntegrationSuccessResponse extends RestResponse {
   constructor(
     public dataDefinition: PaginatedList<IntegrationModel>,
@@ -302,4 +272,17 @@ export class ContentSourceSuccessResponse extends RestResponse {
     super(true, statusCode, statusText);
   }
 }
+
+/**
+ * A successful response containing a Registration
+ */
+export class RegistrationSuccessResponse extends RestResponse {
+  constructor(
+    public registration: Registration,
+    public statusCode: number,
+    public statusText: string,
+  ) {
+    super(true, statusCode, statusText);
+  }
+}
 /* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 715f7a5cc0..8c990ae0b1 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -1,7 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http';
 import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
-
 import { DynamicFormLayoutService, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 import { EffectsModule } from '@ngrx/effects';
 
@@ -69,13 +68,8 @@ import { ItemDataService } from './data/item-data.service';
 import { LicenseDataService } from './data/license-data.service';
 import { LookupRelationService } from './data/lookup-relation.service';
 import { MappedCollectionsReponseParsingService } from './data/mapped-collections-reponse-parsing.service';
-import { MetadatafieldParsingService } from './data/metadatafield-parsing.service';
-import { MetadataschemaParsingService } from './data/metadataschema-parsing.service';
 import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
 import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
-import { RegistryBitstreamformatsResponseParsingService } from './data/registry-bitstreamformats-response-parsing.service';
-import { RegistryMetadatafieldsResponseParsingService } from './data/registry-metadatafields-response-parsing.service';
-import { RegistryMetadataschemasResponseParsingService } from './data/registry-metadataschemas-response-parsing.service';
 import { RelationshipTypeService } from './data/relationship-type.service';
 import { RelationshipService } from './data/relationship.service';
 import { ResourcePolicyService } from './resource-policy/resource-policy.service';
@@ -143,8 +137,17 @@ import { VersionDataService } from './data/version-data.service';
 import { VersionHistoryDataService } from './data/version-history-data.service';
 import { Version } from './shared/version.model';
 import { VersionHistory } from './shared/version-history.model';
+import { Script } from '../process-page/scripts/script.model';
+import { Process } from '../process-page/processes/process.model';
+import { ProcessDataService } from './data/processes/process-data.service';
+import { ScriptDataService } from './data/processes/script-data.service';
+import { ProcessFilesResponseParsingService } from './data/process-files-response-parsing.service';
 import { WorkflowActionDataService } from './data/workflow-action-data.service';
 import { WorkflowAction } from './tasks/models/workflow-action-object.model';
+import { Registration } from './shared/registration.model';
+import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
+import { MetadataFieldDataService } from './data/metadata-field-data.service';
+import { TokenResponseParsingService } from './auth/token-response-parsing.service';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -201,9 +204,6 @@ const PROVIDERS = [
   FacetValueResponseParsingService,
   FacetValueMapResponseParsingService,
   FacetConfigResponseParsingService,
-  RegistryMetadataschemasResponseParsingService,
-  RegistryMetadatafieldsResponseParsingService,
-  RegistryBitstreamformatsResponseParsingService,
   MappedCollectionsReponseParsingService,
   DebugResponseParsingService,
   SearchResponseParsingService,
@@ -223,8 +223,6 @@ const PROVIDERS = [
   JsonPatchOperationsBuilder,
   AuthorityService,
   IntegrationResponseParsingService,
-  MetadataschemaParsingService,
-  MetadatafieldParsingService,
   UploaderService,
   UUIDService,
   NotificationsService,
@@ -264,6 +262,12 @@ const PROVIDERS = [
   LicenseDataService,
   ItemTypeDataService,
   WorkflowActionDataService,
+  ProcessDataService,
+  ScriptDataService,
+  ProcessFilesResponseParsingService,
+  MetadataSchemaDataService,
+  MetadataFieldDataService,
+  TokenResponseParsingService,
   // register AuthInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
@@ -312,9 +316,12 @@ export const models =
     ItemType,
     ExternalSource,
     ExternalSourceEntry,
+    Script,
+    Process,
     Version,
     VersionHistory,
-    WorkflowAction
+    WorkflowAction,
+    Registration
   ];
 
 @NgModule({
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 160ea0ff0d..de0e8a4337 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -88,10 +88,12 @@ export class BundleDataService extends DataService<Bundle> {
   /**
    * Get the bitstreams endpoint for a bundle
    * @param bundleId
+   * @param searchOptions
    */
-  getBitstreamsEndpoint(bundleId: string): Observable<string> {
+  getBitstreamsEndpoint(bundleId: string, searchOptions?: PaginatedSearchOptions): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      switchMap((href: string) => this.halService.getEndpoint(this.bitstreamsEndpoint, `${href}/${bundleId}`))
+      switchMap((href: string) => this.halService.getEndpoint(this.bitstreamsEndpoint, `${href}/${bundleId}`)),
+      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
     );
   }
 
@@ -102,9 +104,8 @@ export class BundleDataService extends DataService<Bundle> {
    * @param linksToFollow   The {@link FollowLinkConfig}s for the request
    */
   getBitstreams(bundleId: string, searchOptions?: PaginatedSearchOptions, ...linksToFollow: Array<FollowLinkConfig<Bitstream>>): Observable<RemoteData<PaginatedList<Bitstream>>> {
-    const hrefObs = this.getBitstreamsEndpoint(bundleId).pipe(
-      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
-    );
+    const hrefObs = this.getBitstreamsEndpoint(bundleId, searchOptions);
+
     hrefObs.pipe(
       take(1)
     ).subscribe((href) => {
diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts
index eb3dabf195..7087655a26 100644
--- a/src/app/core/data/collection-data.service.spec.ts
+++ b/src/app/core/data/collection-data.service.spec.ts
@@ -13,13 +13,19 @@ import { RequestEntry } from './request.reducer';
 import { ErrorResponse, RestResponse } from '../cache/response.models';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Collection } from '../shared/collection.model';
+import { PageInfo } from '../shared/page-info.model';
+import { PaginatedList } from './paginated-list';
+import { createSuccessfulRemoteDataObject } from 'src/app/shared/remote-data.utils';
+import { hot, getTestScheduler, cold } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
 
 const url = 'fake-url';
 const collectionId = 'fake-collection-id';
 
 describe('CollectionDataService', () => {
   let service: CollectionDataService;
-
+  let scheduler: TestScheduler;
   let requestService: RequestService;
   let translate: TranslateService;
   let notificationsService: any;
@@ -27,6 +33,44 @@ describe('CollectionDataService', () => {
   let objectCache: ObjectCacheService;
   let halService: any;
 
+  const mockCollection1: Collection = Object.assign(new Collection(), {
+    id: 'test-collection-1-1',
+    name: 'test-collection-1',
+    _links: {
+      self: {
+        href: 'https://rest.api/collections/test-collection-1-1'
+      }
+    }
+  });
+
+  const mockCollection2: Collection = Object.assign(new Collection(), {
+    id: 'test-collection-2-2',
+    name: 'test-collection-2',
+    _links: {
+      self: {
+        href: 'https://rest.api/collections/test-collection-2-2'
+      }
+    }
+  });
+
+  const mockCollection3: Collection = Object.assign(new Collection(), {
+    id: 'test-collection-3-3',
+    name: 'test-collection-3',
+    _links: {
+      self: {
+        href: 'https://rest.api/collections/test-collection-3-3'
+      }
+    }
+  });
+
+  const queryString = 'test-string';
+  const communityId = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const pageInfo = new PageInfo();
+  const array = [mockCollection1, mockCollection2, mockCollection3];
+  const paginatedList = new PaginatedList(pageInfo, array);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
   describe('when the requests are successful', () => {
     beforeEach(() => {
       createService();
@@ -74,6 +118,43 @@ describe('CollectionDataService', () => {
       });
     });
 
+    describe('when calling getAuthorizedCollection', () => {
+      beforeEach(() => {
+        scheduler = getTestScheduler();
+        spyOn(service, 'getAuthorizedCollection').and.callThrough();
+        spyOn(service, 'getAuthorizedCollectionByCommunity').and.callThrough();
+      });
+
+      it('should proxy the call to getAuthorizedCollection', () => {
+        scheduler.schedule(() => service.getAuthorizedCollection(queryString));
+        scheduler.flush();
+
+        expect(service.getAuthorizedCollection).toHaveBeenCalledWith(queryString);
+      });
+
+      it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollection', () => {
+        const result = service.getAuthorizedCollection(queryString)
+        const expected = cold('a|', {
+          a: paginatedListRD
+        });
+        expect(result).toBeObservable(expected);
+      });
+
+      it('should proxy the call to getAuthorizedCollectionByCommunity', () => {
+        scheduler.schedule(() => service.getAuthorizedCollectionByCommunity(communityId, queryString));
+        scheduler.flush();
+
+        expect(service.getAuthorizedCollectionByCommunity).toHaveBeenCalledWith(communityId, queryString);
+      });
+
+      it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollectionByCommunity', () => {
+        const result = service.getAuthorizedCollectionByCommunity(communityId, queryString)
+        const expected = cold('a|', {
+          a: paginatedListRD
+        });
+        expect(result).toBeObservable(expected);
+      });
+    });
   });
 
   describe('when the requests are unsuccessful', () => {
@@ -117,7 +198,9 @@ describe('CollectionDataService', () => {
   function createService(requestEntry$?) {
     requestService = getMockRequestService(requestEntry$);
     rdbService = jasmine.createSpyObj('rdbService', {
-      buildList: jasmine.createSpy('buildList')
+      buildList: hot('a|', {
+        a: paginatedListRD
+      })
     });
     objectCache = jasmine.createSpyObj('objectCache', {
       remove: jasmine.createSpy('remove')
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index 0639a7d8ca..41f70dd31c 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -72,14 +72,18 @@ export class CollectionDataService extends ComColDataService<Collection> {
   /**
    * Get all collections the user is authorized to submit to
    *
+   * @param query limit the returned collection to those with metadata values matching the query terms.
    * @param options The [[FindListOptions]] object
    * @return Observable<RemoteData<PaginatedList<Collection>>>
    *    collection list
    */
-  getAuthorizedCollection(options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
-    const searchHref = 'findAuthorized';
+  getAuthorizedCollection(query: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<Collection>>): Observable<RemoteData<PaginatedList<Collection>>> {
+    const searchHref = 'findSubmitAuthorized';
+    options = Object.assign({}, options, {
+      searchParams: [new RequestParam('query', query)]
+    });
 
-    return this.searchBy(searchHref, options).pipe(
+    return this.searchBy(searchHref, options, ...linksToFollow).pipe(
       filter((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending));
   }
 
@@ -87,14 +91,18 @@ export class CollectionDataService extends ComColDataService<Collection> {
    * Get all collections the user is authorized to submit to, by community
    *
    * @param communityId The community id
+   * @param query limit the returned collection to those with metadata values matching the query terms.
    * @param options The [[FindListOptions]] object
    * @return Observable<RemoteData<PaginatedList<Collection>>>
    *    collection list
    */
-  getAuthorizedCollectionByCommunity(communityId: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
-    const searchHref = 'findAuthorizedByCommunity';
+  getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
+    const searchHref = 'findSubmitAuthorizedByCommunity';
     options = Object.assign({}, options, {
-      searchParams: [new RequestParam('uuid', communityId)]
+      searchParams: [
+        new RequestParam('uuid', communityId),
+        new RequestParam('query', query)
+      ]
     });
 
     return this.searchBy(searchHref, options).pipe(
@@ -108,7 +116,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
    *    true if the user has at least one collection to submit to
    */
   hasAuthorizedCollection(): Observable<boolean> {
-    const searchHref = 'findAuthorized';
+    const searchHref = 'findSubmitAuthorized';
     const options = new FindListOptions();
     options.elementsPerPage = 1;
 
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index ca59daa5af..7f77d72d3a 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -45,11 +45,12 @@ import {
   FindListOptions,
   FindListRequest,
   GetRequest,
-  PatchRequest
+  PatchRequest, PutRequest
 } from './request.models';
 import { RequestEntry } from './request.reducer';
 import { RequestService } from './request.service';
 import { RestRequestMethod } from './rest-request-method';
+import { GenericConstructor } from '../shared/generic-constructor';
 
 export abstract class DataService<T extends CacheableObject> {
   protected abstract requestService: RequestService;
@@ -343,7 +344,9 @@ export abstract class DataService<T extends CacheableObject> {
       tap((href: string) => {
           this.requestService.removeByHrefSubstring(href);
           const request = new FindListRequest(this.requestService.generateRequestId(), href, options);
-          request.responseMsToLive = 10 * 1000;
+          if (hasValue(this.responseMsToLive)) {
+            request.responseMsToLive = this.responseMsToLive;
+          }
 
           this.requestService.configure(request);
         }
@@ -381,6 +384,28 @@ export abstract class DataService<T extends CacheableObject> {
     );
   }
 
+  /**
+   * Send a PUT request for the specified object
+   *
+   * @param object The object to send a put request for.
+   */
+  put(object: T): Observable<RemoteData<T>> {
+    const requestId = this.requestService.generateRequestId();
+    const serializedObject = new DSpaceSerializer(object.constructor as GenericConstructor<{}>).serialize(object);
+    const request = new PutRequest(requestId, object._links.self.href, serializedObject);
+
+    if (hasValue(this.responseMsToLive)) {
+      request.responseMsToLive = this.responseMsToLive;
+    }
+
+    this.requestService.configure(request);
+
+    return this.requestService.getByUUID(requestId).pipe(
+      find((re: RequestEntry) => hasValue(re) && re.completed),
+      switchMap(() => this.findByHref(object._links.self.href))
+    );
+  }
+
   /**
    * Add a new patch to the object cache
    * The patch is derived from the differences between the given object and its version in the object cache
diff --git a/src/app/core/data/eperson-registration.service.spec.ts b/src/app/core/data/eperson-registration.service.spec.ts
new file mode 100644
index 0000000000..4c91ffd4f1
--- /dev/null
+++ b/src/app/core/data/eperson-registration.service.spec.ts
@@ -0,0 +1,89 @@
+import { RequestService } from './request.service';
+import { EpersonRegistrationService } from './eperson-registration.service';
+import { RegistrationSuccessResponse, RestResponse } from '../cache/response.models';
+import { RequestEntry } from './request.reducer';
+import { cold } from 'jasmine-marbles';
+import { PostRequest } from './request.models';
+import { Registration } from '../shared/registration.model';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+
+describe('EpersonRegistrationService', () => {
+  let service: EpersonRegistrationService;
+  let requestService: RequestService;
+
+  let halService: any;
+
+  const registration = new Registration();
+  registration.email = 'test@mail.org';
+
+  const registrationWithUser = new Registration();
+  registrationWithUser.email = 'test@mail.org';
+  registrationWithUser.user = 'test-uuid';
+
+  beforeEach(() => {
+    halService = new HALEndpointServiceStub('rest-url');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: 'request-id',
+      configure: {},
+      getByUUID: cold('a',
+        {a: Object.assign(new RequestEntry(), {response: new RestResponse(true, 200, 'Success')})})
+    });
+    service = new EpersonRegistrationService(
+      requestService,
+      halService
+    );
+  });
+
+  describe('getRegistrationEndpoint', () => {
+    it('should retrieve the registration endpoint', () => {
+      const expected = service.getRegistrationEndpoint();
+
+      expected.subscribe(((value) => {
+        expect(value).toEqual('rest-url/registrations');
+      }));
+    });
+  });
+
+  describe('getTokenSearchEndpoint', () => {
+    it('should return the token search endpoint for a specified token', () => {
+      const expected = service.getTokenSearchEndpoint('test-token');
+
+      expected.subscribe(((value) => {
+        expect(value).toEqual('rest-url/registrations/search/findByToken?token=test-token');
+      }));
+    });
+  });
+
+  describe('registerEmail', () => {
+    it('should send an email registration', () => {
+
+      const expected = service.registerEmail('test@mail.org');
+
+      expect(requestService.configure).toHaveBeenCalledWith(new PostRequest('request-id', 'rest-url/registrations', registration));
+      expect(expected).toBeObservable(cold('a', {a: new RestResponse(true, 200, 'Success')}));
+    });
+  });
+
+  describe('searchByToken', () => {
+    beforeEach(() => {
+      (requestService.getByUUID as jasmine.Spy).and.returnValue(
+        cold('a',
+          {a: Object.assign(new RequestEntry(), {response: new RegistrationSuccessResponse(registrationWithUser, 200, 'Success')})})
+      );
+    });
+    it('should return a registration corresponding to the provided token', () => {
+      const expected = service.searchByToken('test-token');
+
+      expect(expected).toBeObservable(cold('(a|)', {
+        a: Object.assign(new Registration(), {
+          email: registrationWithUser.email,
+          token: 'test-token',
+          user: registrationWithUser.user
+        })
+      }));
+
+    });
+  });
+
+});
diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts
new file mode 100644
index 0000000000..caa6150711
--- /dev/null
+++ b/src/app/core/data/eperson-registration.service.ts
@@ -0,0 +1,108 @@
+import { Injectable } from '@angular/core';
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { GetRequest, PostRequest } from './request.models';
+import { Observable } from 'rxjs';
+import { filter, find, map, take } from 'rxjs/operators';
+import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { Registration } from '../shared/registration.model';
+import { filterSuccessfulResponses, getResponseFromEntry } from '../shared/operators';
+import { ResponseParsingService } from './parsing.service';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { RegistrationResponseParsingService } from './registration-response-parsing.service';
+import { RegistrationSuccessResponse } from '../cache/response.models';
+
+@Injectable(
+  {
+    providedIn: 'root',
+  }
+)
+/**
+ * Service that will register a new email address and request a token
+ */
+export class EpersonRegistrationService {
+
+  protected linkPath = 'registrations';
+  protected searchByTokenPath = '/search/findByToken?token=';
+
+  constructor(
+    protected requestService: RequestService,
+    protected halService: HALEndpointService,
+  ) {
+
+  }
+
+  /**
+   * Retrieves the Registration endpoint
+   */
+  getRegistrationEndpoint(): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath);
+  }
+
+  /**
+   * Retrieves the endpoint to search by registration token
+   */
+  getTokenSearchEndpoint(token: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      filter((href: string) => isNotEmpty(href)),
+      map((href: string) => `${href}${this.searchByTokenPath}${token}`));
+  }
+
+  /**
+   * Register a new email address
+   * @param email
+   */
+  registerEmail(email: string) {
+    const registration = new Registration();
+    registration.email = email;
+
+    const requestId = this.requestService.generateRequestId();
+
+    const hrefObs = this.getRegistrationEndpoint();
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new PostRequest(requestId, href, registration);
+        this.requestService.configure(request);
+      })
+    ).subscribe();
+
+    return this.requestService.getByUUID(requestId).pipe(
+      getResponseFromEntry()
+    );
+  }
+
+  /**
+   * Search a registration based on the provided token
+   * @param token
+   */
+  searchByToken(token: string): Observable<Registration> {
+    const requestId = this.requestService.generateRequestId();
+
+    const hrefObs = this.getTokenSearchEndpoint(token);
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new GetRequest(requestId, href);
+        Object.assign(request, {
+          getResponseParser(): GenericConstructor<ResponseParsingService> {
+            return RegistrationResponseParsingService;
+          }
+        });
+        this.requestService.configure(request);
+      })
+    ).subscribe();
+
+    return this.requestService.getByUUID(requestId).pipe(
+      filterSuccessfulResponses(),
+      map((restResponse: RegistrationSuccessResponse) => {
+        return Object.assign(new Registration(), {email: restResponse.registration.email, token: token, user: restResponse.registration.user});
+      }),
+      take(1),
+    );
+
+  }
+
+}
diff --git a/src/app/core/data/metadata-field-data.service.spec.ts b/src/app/core/data/metadata-field-data.service.spec.ts
new file mode 100644
index 0000000000..5c17b56845
--- /dev/null
+++ b/src/app/core/data/metadata-field-data.service.spec.ts
@@ -0,0 +1,114 @@
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { CreateRequest, FindListOptions, PutRequest } from './request.models';
+import { MetadataFieldDataService } from './metadata-field-data.service';
+import { MetadataField } from '../metadata/metadata-field.model';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RequestParam } from '../cache/models/request-param.model';
+
+describe('MetadataFieldDataService', () => {
+  let metadataFieldService: MetadataFieldDataService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let schema: MetadataSchema;
+  let rdbService: RemoteDataBuildService;
+
+  const endpoint = 'api/metadatafield/endpoint';
+
+  function init() {
+    schema = Object.assign(new MetadataSchema(), {
+      prefix: 'dc',
+      namespace: 'namespace',
+      _links: {
+        self: { href: 'selflink' }
+      }
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
+      configure: {},
+      getByUUID: observableOf({ response: new RestResponse(true, 200, 'OK') }),
+      removeByHrefSubstring: {}
+    });
+    halService = Object.assign(new HALEndpointServiceStub(endpoint));
+    notificationsService = jasmine.createSpyObj('notificationsService', {
+      error: {}
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$(undefined)
+    });
+    metadataFieldService = new MetadataFieldDataService(requestService, rdbService, undefined, halService, undefined, undefined, undefined, notificationsService);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('findBySchema', () => {
+    beforeEach(() => {
+      spyOn(metadataFieldService, 'searchBy');
+    });
+
+    it('should call searchBy with the correct arguments', () => {
+      metadataFieldService.findBySchema(schema);
+      const expectedOptions = Object.assign(new FindListOptions(), {
+        searchParams: [new RequestParam('schema', schema.prefix)]
+      });
+      expect(metadataFieldService.searchBy).toHaveBeenCalledWith('bySchema', expectedOptions);
+    });
+  });
+
+  describe('createOrUpdateMetadataField', () => {
+    let field: MetadataField;
+
+    beforeEach(() => {
+      field = Object.assign(new MetadataField(), {
+        element: 'identifier',
+        qualifier: undefined,
+        schema: schema,
+        _links: {
+          self: { href: 'selflink' }
+        }
+      });
+    });
+
+    describe('called with a new metadata field', () => {
+      it('should send a CreateRequest', (done) => {
+        metadataFieldService.createOrUpdateMetadataField(field).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(CreateRequest));
+          done();
+        });
+      });
+    });
+
+    describe('called with an existing metadata field', () => {
+      beforeEach(() => {
+        field = Object.assign(field, {
+          id: 'id-of-existing-field'
+        });
+      });
+
+      it('should send a PutRequest', (done) => {
+        metadataFieldService.createOrUpdateMetadataField(field).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PutRequest));
+          done();
+        });
+      });
+    });
+  });
+
+  describe('clearRequests', () => {
+    it('should remove requests on the data service\'s endpoint', (done) => {
+      metadataFieldService.clearRequests().subscribe(() => {
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(`${endpoint}/${(metadataFieldService as any).linkPath}`);
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/metadata-field-data.service.ts b/src/app/core/data/metadata-field-data.service.ts
new file mode 100644
index 0000000000..f50be20f13
--- /dev/null
+++ b/src/app/core/data/metadata-field-data.service.ts
@@ -0,0 +1,89 @@
+import { Injectable } from '@angular/core';
+import { dataService } from '../cache/builders/build-decorators';
+import { DataService } from './data.service';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { HttpClient } from '@angular/common/http';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { METADATA_FIELD } from '../metadata/metadata-field.resource-type';
+import { MetadataField } from '../metadata/metadata-field.model';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { FindListOptions, FindListRequest } from './request.models';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { Observable } from 'rxjs/internal/Observable';
+import { hasValue } from '../../shared/empty.util';
+import { find, skipWhile, switchMap, tap } from 'rxjs/operators';
+import { RemoteData } from './remote-data';
+import { RequestParam } from '../cache/models/request-param.model';
+import { PaginatedList } from './paginated-list';
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the metadatafields endpoint
+ */
+@Injectable()
+@dataService(METADATA_FIELD)
+export class MetadataFieldDataService extends DataService<MetadataField> {
+  protected linkPath = 'metadatafields';
+  protected searchBySchemaLinkPath = 'bySchema';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected halService: HALEndpointService,
+    protected objectCache: ObjectCacheService,
+    protected comparator: DefaultChangeAnalyzer<MetadataField>,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService) {
+    super();
+  }
+
+  /**
+   * Find metadata fields belonging to a metadata schema
+   * @param schema        The metadata schema to list fields for
+   * @param options       The options info used to retrieve the fields
+   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  findBySchema(schema: MetadataSchema, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<MetadataField>>) {
+    const optionsWithSchema = Object.assign(new FindListOptions(), options, {
+      searchParams: [new RequestParam('schema', schema.prefix)]
+    });
+    return this.searchBy(this.searchBySchemaLinkPath, optionsWithSchema, ...linksToFollow);
+  }
+
+  /**
+   * Create or Update a MetadataField
+   *  If the MetadataField contains an id, it is assumed the field already exists and is updated instead
+   *  Since creating or updating is nearly identical, the only real difference is the request (and slight difference in endpoint):
+   *  - On creation, a CreateRequest is used
+   *  - On update, a PutRequest is used
+   * @param field    The MetadataField to create or update
+   */
+  createOrUpdateMetadataField(field: MetadataField): Observable<RemoteData<MetadataField>> {
+    const isUpdate = hasValue(field.id);
+
+    if (isUpdate) {
+      return this.put(field);
+    } else {
+      return this.create(field, new RequestParam('schemaId', field.schema.id));
+    }
+  }
+
+  /**
+   * Clear all metadata field requests
+   * Used for refreshing lists after adding/updating/removing a metadata field from a metadata schema
+   */
+  clearRequests(): Observable<string> {
+    return this.getBrowseEndpoint().pipe(
+      tap((href: string) => {
+        this.requestService.removeByHrefSubstring(href);
+      })
+    );
+  }
+
+}
diff --git a/src/app/core/data/metadata-schema-data.service.spec.ts b/src/app/core/data/metadata-schema-data.service.spec.ts
new file mode 100644
index 0000000000..bf73deecb7
--- /dev/null
+++ b/src/app/core/data/metadata-schema-data.service.spec.ts
@@ -0,0 +1,89 @@
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { MetadataSchemaDataService } from './metadata-schema-data.service';
+import { of as observableOf } from 'rxjs';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { CreateRequest, PutRequest } from './request.models';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+describe('MetadataSchemaDataService', () => {
+  let metadataSchemaService: MetadataSchemaDataService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let rdbService: RemoteDataBuildService;
+
+  const endpoint = 'api/metadataschema/endpoint';
+
+  function init() {
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
+      configure: {},
+      getByUUID: observableOf({ response: new RestResponse(true, 200, 'OK') }),
+      removeByHrefSubstring: {}
+    });
+    halService = Object.assign(new HALEndpointServiceStub(endpoint));
+    notificationsService = jasmine.createSpyObj('notificationsService', {
+      error: {}
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$(undefined)
+    });
+    metadataSchemaService = new MetadataSchemaDataService(requestService, rdbService, undefined, halService, undefined, undefined, undefined, notificationsService);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('createOrUpdateMetadataSchema', () => {
+    let schema: MetadataSchema;
+
+    beforeEach(() => {
+      schema = Object.assign(new MetadataSchema(), {
+        prefix: 'dc',
+        namespace: 'namespace',
+        _links: {
+          self: { href: 'selflink' }
+        }
+      });
+    });
+
+    describe('called with a new metadata schema', () => {
+      it('should send a CreateRequest', (done) => {
+        metadataSchemaService.createOrUpdateMetadataSchema(schema).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(CreateRequest));
+          done();
+        });
+      });
+    });
+
+    describe('called with an existing metadata schema', () => {
+      beforeEach(() => {
+        schema = Object.assign(schema, {
+          id: 'id-of-existing-schema'
+        });
+      });
+
+      it('should send a PutRequest', (done) => {
+        metadataSchemaService.createOrUpdateMetadataSchema(schema).subscribe(() => {
+          expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PutRequest));
+          done();
+        });
+      });
+    });
+  });
+
+  describe('clearRequests', () => {
+    it('should remove requests on the data service\'s endpoint', (done) => {
+      metadataSchemaService.clearRequests().subscribe(() => {
+        expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(`${endpoint}/${(metadataSchemaService as any).linkPath}`);
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index 915f588379..99a3f98b8e 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -9,37 +9,21 @@ import { CoreState } from '../core.reducers';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { METADATA_SCHEMA } from '../metadata/metadata-schema.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ChangeAnalyzer } from './change-analyzer';
-
 import { DataService } from './data.service';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
 import { RequestService } from './request.service';
-
-/* tslint:disable:max-classes-per-file */
-class DataServiceImpl extends DataService<MetadataSchema> {
-  protected linkPath = 'metadataschemas';
-
-  constructor(
-    protected requestService: RequestService,
-    protected rdbService: RemoteDataBuildService,
-    protected store: Store<CoreState>,
-    protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-    protected http: HttpClient,
-    protected comparator: ChangeAnalyzer<MetadataSchema>) {
-    super();
-  }
-
-}
+import { Observable } from 'rxjs/internal/Observable';
+import { hasValue } from '../../shared/empty.util';
+import { tap } from 'rxjs/operators';
+import { RemoteData } from './remote-data';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadataschemas endpoint
  */
 @Injectable()
 @dataService(METADATA_SCHEMA)
-export class MetadataSchemaDataService {
-  private dataService: DataServiceImpl;
+export class MetadataSchemaDataService extends DataService<MetadataSchema> {
+  protected linkPath = 'metadataschemas';
 
   constructor(
     protected requestService: RequestService,
@@ -50,6 +34,35 @@ export class MetadataSchemaDataService {
     protected comparator: DefaultChangeAnalyzer<MetadataSchema>,
     protected http: HttpClient,
     protected notificationsService: NotificationsService) {
-    this.dataService = new DataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparator);
+    super();
   }
+
+  /**
+   * Create or Update a MetadataSchema
+   *  If the MetadataSchema contains an id, it is assumed the schema already exists and is updated instead
+   *  Since creating or updating is nearly identical, the only real difference is the request (and slight difference in endpoint):
+   *  - On creation, a CreateRequest is used
+   *  - On update, a PutRequest is used
+   * @param schema    The MetadataSchema to create or update
+   */
+  createOrUpdateMetadataSchema(schema: MetadataSchema): Observable<RemoteData<MetadataSchema>> {
+    const isUpdate = hasValue(schema.id);
+
+    if (isUpdate) {
+      return this.put(schema);
+    } else {
+      return this.create(schema);
+    }
+  }
+
+  /**
+   * Clear all metadata schema requests
+   * Used for refreshing lists after adding/updating/removing a metadata schema in the registry
+   */
+  clearRequests(): Observable<string> {
+    return this.getBrowseEndpoint().pipe(
+      tap((href: string) => this.requestService.removeByHrefSubstring(href))
+    );
+  }
+
 }
diff --git a/src/app/core/data/metadatafield-parsing.service.ts b/src/app/core/data/metadatafield-parsing.service.ts
deleted file mode 100644
index 08f7892ac7..0000000000
--- a/src/app/core/data/metadatafield-parsing.service.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MetadatafieldSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { MetadataField } from '../metadata/metadata-field.model';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-/**
- * A service responsible for parsing DSpaceRESTV2Response data related to a single MetadataField to a valid RestResponse
- */
-@Injectable()
-export class MetadatafieldParsingService implements ResponseParsingService {
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    const deserialized = new DSpaceSerializer(MetadataField).deserialize(payload);
-    return new MetadatafieldSuccessResponse(deserialized, data.statusCode, data.statusText);
-  }
-
-}
diff --git a/src/app/core/data/metadataschema-parsing.service.ts b/src/app/core/data/metadataschema-parsing.service.ts
deleted file mode 100644
index f4b90e5dcd..0000000000
--- a/src/app/core/data/metadataschema-parsing.service.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Injectable } from '@angular/core';
-import { MetadataschemaSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class MetadataschemaParsingService implements ResponseParsingService {
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    const deserialized = new DSpaceSerializer(MetadataSchema).deserialize(payload);
-    return new MetadataschemaSuccessResponse(deserialized, data.statusCode, data.statusText);
-  }
-
-}
diff --git a/src/app/core/data/object-updates/object-updates.actions.ts b/src/app/core/data/object-updates/object-updates.actions.ts
index 94918157ee..f26be768b1 100644
--- a/src/app/core/data/object-updates/object-updates.actions.ts
+++ b/src/app/core/data/object-updates/object-updates.actions.ts
@@ -8,7 +8,6 @@ import {INotification} from '../../../shared/notifications/models/notification.m
  */
 export const ObjectUpdatesActionTypes = {
   INITIALIZE_FIELDS: type('dspace/core/cache/object-updates/INITIALIZE_FIELDS'),
-  ADD_PAGE_TO_CUSTOM_ORDER: type('dspace/core/cache/object-updates/ADD_PAGE_TO_CUSTOM_ORDER'),
   SET_EDITABLE_FIELD: type('dspace/core/cache/object-updates/SET_EDITABLE_FIELD'),
   SET_VALID_FIELD: type('dspace/core/cache/object-updates/SET_VALID_FIELD'),
   ADD_FIELD: type('dspace/core/cache/object-updates/ADD_FIELD'),
@@ -17,8 +16,7 @@ export const ObjectUpdatesActionTypes = {
   REINSTATE: type('dspace/core/cache/object-updates/REINSTATE'),
   REMOVE: type('dspace/core/cache/object-updates/REMOVE'),
   REMOVE_ALL: type('dspace/core/cache/object-updates/REMOVE_ALL'),
-  REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD'),
-  MOVE: type('dspace/core/cache/object-updates/MOVE'),
+  REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD')
 };
 
 /* tslint:disable:max-classes-per-file */
@@ -29,8 +27,7 @@ export const ObjectUpdatesActionTypes = {
 export enum FieldChangeType {
   UPDATE = 0,
   ADD = 1,
-  REMOVE = 2,
-  MOVE = 3
+  REMOVE = 2
 }
 
 /**
@@ -41,10 +38,7 @@ export class InitializeFieldsAction implements Action {
   payload: {
     url: string,
     fields: Identifiable[],
-    lastModified: Date,
-    order: string[],
-    pageSize: number,
-    page: number
+    lastModified: Date
   };
 
   /**
@@ -61,42 +55,9 @@ export class InitializeFieldsAction implements Action {
   constructor(
     url: string,
     fields: Identifiable[],
-    lastModified: Date,
-    order: string[] = [],
-    pageSize: number = 9999,
-    page: number = 0
+    lastModified: Date
   ) {
-    this.payload = { url, fields, lastModified, order, pageSize, page };
-  }
-}
-
-/**
- * An ngrx action to initialize a new page's fields in the ObjectUpdates state
- */
-export class AddPageToCustomOrderAction implements Action {
-  type = ObjectUpdatesActionTypes.ADD_PAGE_TO_CUSTOM_ORDER;
-  payload: {
-    url: string,
-    fields: Identifiable[],
-    order: string[],
-    page: number
-  };
-
-  /**
-   * Create a new AddPageToCustomOrderAction
-   *
-   * @param url The unique url of the page for which the fields are being added
-   * @param fields The identifiable fields of which the updates are kept track of
-   * @param order A custom order to keep track of objects moving around
-   * @param page The page to populate in the custom order
-   */
-  constructor(
-    url: string,
-    fields: Identifiable[],
-    order: string[] = [],
-    page: number = 0
-  ) {
-    this.payload = { url, fields, order, page };
+    this.payload = { url, fields, lastModified };
   }
 }
 
@@ -320,43 +281,6 @@ export class RemoveFieldUpdateAction implements Action {
   }
 }
 
-/**
- * An ngrx action to remove a single field update in the ObjectUpdates state for a certain page url and field uuid
- */
-export class MoveFieldUpdateAction implements Action {
-  type = ObjectUpdatesActionTypes.MOVE;
-  payload: {
-    url: string,
-    from: number,
-    to: number,
-    fromPage: number,
-    toPage: number,
-    field?: Identifiable
-  };
-
-  /**
-   * Create a new RemoveObjectUpdatesAction
-   *
-   * @param url
-   *    the unique url of the page for which a field's change should be removed
-   * @param from      The index of the object to move
-   * @param to        The index to move the object to
-   * @param fromPage  The page to move the object from
-   * @param toPage    The page to move the object to
-   * @param field     Optional field to add to the fieldUpdates list (useful when we want to track updates across multiple pages)
-   */
-  constructor(
-    url: string,
-    from: number,
-    to: number,
-    fromPage: number,
-    toPage: number,
-    field?: Identifiable
-  ) {
-    this.payload = { url, from, to, fromPage, toPage, field };
-  }
-}
-
 /* tslint:enable:max-classes-per-file */
 
 /**
@@ -369,8 +293,6 @@ export type ObjectUpdatesAction
   | ReinstateObjectUpdatesAction
   | RemoveObjectUpdatesAction
   | RemoveFieldUpdateAction
-  | MoveFieldUpdateAction
-  | AddPageToCustomOrderAction
   | RemoveAllObjectUpdatesAction
   | SelectVirtualMetadataAction
   | SetEditableFieldUpdateAction
diff --git a/src/app/core/data/object-updates/object-updates.reducer.spec.ts b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
index bdf202049e..cb7f44039c 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
@@ -1,9 +1,9 @@
 import * as deepFreeze from 'deep-freeze';
 import {
-  AddFieldUpdateAction, AddPageToCustomOrderAction,
+  AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
   FieldChangeType,
-  InitializeFieldsAction, MoveFieldUpdateAction,
+  InitializeFieldsAction,
   ReinstateObjectUpdatesAction, RemoveAllObjectUpdatesAction,
   RemoveFieldUpdateAction, RemoveObjectUpdatesAction, SelectVirtualMetadataAction,
   SetEditableFieldUpdateAction, SetValidFieldUpdateAction
@@ -85,16 +85,6 @@ describe('objectUpdatesReducer', () => {
       virtualMetadataSources: {
         [relationship.uuid]: {[identifiable1.uuid]: true}
       },
-      customOrder: {
-        initialOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        newOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        pageSize: 10,
-        changed: false
-      }
     }
   };
 
@@ -121,16 +111,6 @@ describe('objectUpdatesReducer', () => {
       virtualMetadataSources: {
         [relationship.uuid]: {[identifiable1.uuid]: true}
       },
-      customOrder: {
-        initialOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        newOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        pageSize: 10,
-        changed: false
-      }
     },
     [url + OBJECT_UPDATES_TRASH_PATH]: {
       fieldStates: {
@@ -165,16 +145,6 @@ describe('objectUpdatesReducer', () => {
       virtualMetadataSources: {
         [relationship.uuid]: {[identifiable1.uuid]: true}
       },
-      customOrder: {
-        initialOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        newOrderPages: [
-          { order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid] }
-        ],
-        pageSize: 10,
-        changed: false
-      }
     }
   };
 
@@ -243,7 +213,7 @@ describe('objectUpdatesReducer', () => {
   });
 
   it('should initialize all fields when the INITIALIZE action is dispatched, based on the payload', () => {
-    const action = new InitializeFieldsAction(url, [identifiable1, identifiable3], modDate, [identifiable1.uuid, identifiable3.uuid], 10, 0);
+    const action = new InitializeFieldsAction(url, [identifiable1, identifiable3], modDate);
 
     const expectedState = {
       [url]: {
@@ -261,17 +231,7 @@ describe('objectUpdatesReducer', () => {
         },
         fieldUpdates: {},
         virtualMetadataSources: {},
-        lastModified: modDate,
-        customOrder: {
-          initialOrderPages: [
-            { order: [identifiable1.uuid, identifiable3.uuid] }
-          ],
-          newOrderPages: [
-            { order: [identifiable1.uuid, identifiable3.uuid] }
-          ],
-          pageSize: 10,
-          changed: false
-        }
+        lastModified: modDate
       }
     };
     const newState = objectUpdatesReducer(testState, action);
@@ -337,30 +297,4 @@ describe('objectUpdatesReducer', () => {
     const newState = objectUpdatesReducer(testState, action);
     expect(newState[url].fieldUpdates[uuid]).toBeUndefined();
   });
-
-  it('should move the custom order from the state when the MOVE action is dispatched', () => {
-    const action = new MoveFieldUpdateAction(url, 0, 1, 0, 0);
-
-    const newState = objectUpdatesReducer(testState, action);
-    expect(newState[url].customOrder.newOrderPages[0].order[0]).toEqual(testState[url].customOrder.newOrderPages[0].order[1]);
-    expect(newState[url].customOrder.newOrderPages[0].order[1]).toEqual(testState[url].customOrder.newOrderPages[0].order[0]);
-    expect(newState[url].customOrder.changed).toEqual(true);
-  });
-
-  it('should add a new page to the custom order and add empty pages in between when the ADD_PAGE_TO_CUSTOM_ORDER action is dispatched', () => {
-    const identifiable4 = {
-      uuid: 'a23eae5a-7857-4ef9-8e52-989436ad2955',
-      key: 'dc.description.abstract',
-      language: null,
-      value: 'Extra value'
-    };
-    const action = new AddPageToCustomOrderAction(url, [identifiable4], [identifiable4.uuid], 2);
-
-    const newState = objectUpdatesReducer(testState, action);
-    // Confirm the page in between the two pages (index 1) has been filled with 10 (page size) undefined values
-    expect(newState[url].customOrder.newOrderPages[1].order.length).toEqual(10);
-    expect(newState[url].customOrder.newOrderPages[1].order[0]).toBeUndefined();
-    // Verify the new page is correct
-    expect(newState[url].customOrder.newOrderPages[2].order[0]).toEqual(identifiable4.uuid);
-  });
 });
diff --git a/src/app/core/data/object-updates/object-updates.reducer.ts b/src/app/core/data/object-updates/object-updates.reducer.ts
index 759a9f5c87..b1626a5ff5 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.ts
@@ -1,8 +1,8 @@
 import {
-  AddFieldUpdateAction, AddPageToCustomOrderAction,
+  AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
   FieldChangeType,
-  InitializeFieldsAction, MoveFieldUpdateAction,
+  InitializeFieldsAction,
   ObjectUpdatesAction,
   ObjectUpdatesActionTypes,
   ReinstateObjectUpdatesAction,
@@ -12,9 +12,7 @@ import {
   SetValidFieldUpdateAction,
   SelectVirtualMetadataAction,
 } from './object-updates.actions';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
-import { moveItemInArray, transferArrayItem } from '@angular/cdk/drag-drop';
-import { from } from 'rxjs/internal/observable/from';
+import { hasNoValue, hasValue } from '../../../shared/empty.util';
 import {Relationship} from '../../shared/item-relationships/relationship.model';
 
 /**
@@ -83,20 +81,6 @@ export interface DeleteRelationship extends Relationship {
   keepRightVirtualMetadata: boolean,
 }
 
-/**
- * A custom order given to the list of objects
- */
-export interface CustomOrder {
-  initialOrderPages: OrderPage[],
-  newOrderPages: OrderPage[],
-  pageSize: number;
-  changed: boolean
-}
-
-export interface OrderPage {
-  order: string[]
-}
-
 /**
  * The updated state of a single page
  */
@@ -105,7 +89,6 @@ export interface ObjectUpdatesEntry {
   fieldUpdates: FieldUpdates;
   virtualMetadataSources: VirtualMetadataSources;
   lastModified: Date;
-  customOrder: CustomOrder
 }
 
 /**
@@ -138,9 +121,6 @@ export function objectUpdatesReducer(state = initialState, action: ObjectUpdates
     case ObjectUpdatesActionTypes.INITIALIZE_FIELDS: {
       return initializeFieldsUpdate(state, action as InitializeFieldsAction);
     }
-    case ObjectUpdatesActionTypes.ADD_PAGE_TO_CUSTOM_ORDER: {
-      return addPageToCustomOrder(state, action as AddPageToCustomOrderAction);
-    }
     case ObjectUpdatesActionTypes.ADD_FIELD: {
       return addFieldUpdate(state, action as AddFieldUpdateAction);
     }
@@ -168,9 +148,6 @@ export function objectUpdatesReducer(state = initialState, action: ObjectUpdates
     case ObjectUpdatesActionTypes.SET_VALID_FIELD: {
       return setValidFieldUpdate(state, action as SetValidFieldUpdateAction);
     }
-    case ObjectUpdatesActionTypes.MOVE: {
-      return moveFieldUpdate(state, action as MoveFieldUpdateAction);
-    }
     default: {
       return state;
     }
@@ -186,50 +163,18 @@ function initializeFieldsUpdate(state: any, action: InitializeFieldsAction) {
   const url: string = action.payload.url;
   const fields: Identifiable[] = action.payload.fields;
   const lastModifiedServer: Date = action.payload.lastModified;
-  const order = action.payload.order;
-  const pageSize = action.payload.pageSize;
-  const page = action.payload.page;
   const fieldStates = createInitialFieldStates(fields);
-  const initialOrderPages = addOrderToPages([], order, pageSize, page);
   const newPageState = Object.assign(
     {},
     state[url],
     { fieldStates: fieldStates },
     { fieldUpdates: {} },
     { virtualMetadataSources: {} },
-    { lastModified: lastModifiedServer },
-    { customOrder: {
-      initialOrderPages: initialOrderPages,
-      newOrderPages: initialOrderPages,
-      pageSize: pageSize,
-      changed: false }
-    }
+    { lastModified: lastModifiedServer }
   );
   return Object.assign({}, state, { [url]: newPageState });
 }
 
-/**
- * Add a page of objects to the state of a specific url and update a specific page of the custom order
- * @param state The current state
- * @param action The action to perform on the current state
- */
-function addPageToCustomOrder(state: any, action: AddPageToCustomOrderAction) {
-  const url: string = action.payload.url;
-  const fields: Identifiable[] = action.payload.fields;
-  const fieldStates = createInitialFieldStates(fields);
-  const order = action.payload.order;
-  const page = action.payload.page;
-  const pageState: ObjectUpdatesEntry = state[url] || {};
-  const newPageState = Object.assign({}, pageState, {
-    fieldStates: Object.assign({}, pageState.fieldStates, fieldStates),
-    customOrder: Object.assign({}, pageState.customOrder, {
-      newOrderPages: addOrderToPages(pageState.customOrder.newOrderPages, order, pageState.customOrder.pageSize, page),
-      initialOrderPages: addOrderToPages(pageState.customOrder.initialOrderPages, order, pageState.customOrder.pageSize, page)
-    })
-  });
-  return Object.assign({}, state, { [url]: newPageState });
-}
-
 /**
  * Add a new update for a specific field to the store
  * @param state The current state
@@ -338,19 +283,9 @@ function discardObjectUpdatesFor(url: string, state: any) {
     }
   });
 
-  const newCustomOrder = Object.assign({}, pageState.customOrder);
-  if (pageState.customOrder.changed) {
-    const initialOrder = pageState.customOrder.initialOrderPages;
-    if (isNotEmpty(initialOrder)) {
-      newCustomOrder.newOrderPages = initialOrder;
-      newCustomOrder.changed = false;
-    }
-  }
-
   const discardedPageState = Object.assign({}, pageState, {
     fieldUpdates: {},
-    fieldStates: newFieldStates,
-    customOrder: newCustomOrder
+    fieldStates: newFieldStates
   });
   return Object.assign({}, state, { [url]: discardedPageState }, { [url + OBJECT_UPDATES_TRASH_PATH]: pageState });
 }
@@ -504,121 +439,3 @@ function createInitialFieldStates(fields: Identifiable[]) {
   uuids.forEach((uuid: string) => fieldStates[uuid] = initialFieldState);
   return fieldStates;
 }
-
-/**
- * Method to add a list of objects to an existing FieldStates object
- * @param fieldStates                   FieldStates to add states to
- * @param fields Identifiable objects   The list of objects to add to the FieldStates
- */
-function addFieldStates(fieldStates: FieldStates, fields: Identifiable[]) {
-  const uuids = fields.map((field: Identifiable) => field.uuid);
-  uuids.forEach((uuid: string) => fieldStates[uuid] = initialFieldState);
-  return fieldStates;
-}
-
-/**
- * Move an object within the custom order of a page state
- * @param state   The current state
- * @param action  The move action to perform
- */
-function moveFieldUpdate(state: any, action: MoveFieldUpdateAction) {
-  const url = action.payload.url;
-  const fromIndex = action.payload.from;
-  const toIndex = action.payload.to;
-  const fromPage = action.payload.fromPage;
-  const toPage = action.payload.toPage;
-  const field = action.payload.field;
-
-  const pageState: ObjectUpdatesEntry = state[url];
-  const initialOrderPages = pageState.customOrder.initialOrderPages;
-  const customOrderPages = [...pageState.customOrder.newOrderPages];
-
-  // Create a copy of the custom orders for the from- and to-pages
-  const fromPageOrder = [...customOrderPages[fromPage].order];
-  const toPageOrder = [...customOrderPages[toPage].order];
-  if (fromPage === toPage) {
-    if (isNotEmpty(customOrderPages[fromPage]) && isNotEmpty(customOrderPages[fromPage].order[fromIndex]) && isNotEmpty(customOrderPages[fromPage].order[toIndex])) {
-      // Move an item from one index to another within the same page
-      moveItemInArray(fromPageOrder, fromIndex, toIndex);
-      // Update the custom order for this page
-      customOrderPages[fromPage] = { order: fromPageOrder };
-    }
-  } else {
-    if (isNotEmpty(customOrderPages[fromPage]) && hasValue(customOrderPages[toPage]) && isNotEmpty(customOrderPages[fromPage].order[fromIndex])) {
-      // Move an item from one index of one page to an index in another page
-      transferArrayItem(fromPageOrder, toPageOrder, fromIndex, toIndex);
-      // Update the custom order for both pages
-      customOrderPages[fromPage] = { order: fromPageOrder };
-      customOrderPages[toPage] = { order: toPageOrder };
-    }
-  }
-
-  // Create a field update if it doesn't exist for this field yet
-  let fieldUpdate = {};
-  if (hasValue(field)) {
-    fieldUpdate = pageState.fieldUpdates[field.uuid];
-    if (hasNoValue(fieldUpdate)) {
-      fieldUpdate = { field: field, changeType: undefined }
-    }
-  }
-
-  // Update the store's state with new values and return
-  return Object.assign({}, state, { [url]: Object.assign({}, pageState, {
-    fieldUpdates: Object.assign({}, pageState.fieldUpdates, hasValue(field) ? { [field.uuid]: fieldUpdate } : {}),
-    customOrder: Object.assign({}, pageState.customOrder, { newOrderPages: customOrderPages, changed: checkForOrderChanges(initialOrderPages, customOrderPages) })
-  })})
-}
-
-/**
- * Compare two lists of OrderPage objects and return whether there's at least one change in the order of objects within
- * @param initialOrderPages The initial list of OrderPages
- * @param customOrderPages  The changed list of OrderPages
- */
-function checkForOrderChanges(initialOrderPages: OrderPage[], customOrderPages: OrderPage[]) {
-  let changed = false;
-  initialOrderPages.forEach((orderPage: OrderPage, page: number) => {
-    if (isNotEmpty(orderPage) && isNotEmpty(orderPage.order) && isNotEmpty(customOrderPages[page]) && isNotEmpty(customOrderPages[page].order)) {
-      orderPage.order.forEach((id: string, index: number) => {
-        if (id !== customOrderPages[page].order[index]) {
-          changed = true;
-          return;
-        }
-      });
-      if (changed) {
-        return;
-      }
-    }
-  });
-  return changed;
-}
-
-/**
- * Initialize a custom order page by providing the list of all pages, a list of UUIDs, pageSize and the page to populate
- * @param initialPages  The initial list of OrderPage objects
- * @param order         The list of UUIDs to create a page for
- * @param pageSize      The pageSize used to populate empty spacer pages
- * @param page          The index of the page to add
- */
-function addOrderToPages(initialPages: OrderPage[], order: string[], pageSize: number, page: number): OrderPage[] {
-  const result = [...initialPages];
-  const orderPage: OrderPage = { order: order };
-  if (page < result.length) {
-    // The page we're trying to add already exists in the list. Overwrite it.
-    result[page] = orderPage;
-  } else if (page === result.length) {
-    // The page we're trying to add is the next page in the list, add it.
-    result.push(orderPage);
-  } else {
-    // The page we're trying to add is at least one page ahead of the list, fill the list with empty pages before adding the page.
-    const emptyOrder = [];
-    for (let i = 0; i < pageSize; i++) {
-      emptyOrder.push(undefined);
-    }
-    const emptyOrderPage: OrderPage = { order: emptyOrder };
-    for (let i = result.length; i < page; i++) {
-      result.push(emptyOrderPage);
-    }
-    result.push(orderPage);
-  }
-  return result;
-}
diff --git a/src/app/core/data/object-updates/object-updates.service.spec.ts b/src/app/core/data/object-updates/object-updates.service.spec.ts
index 780a402a84..04018b8de2 100644
--- a/src/app/core/data/object-updates/object-updates.service.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.service.spec.ts
@@ -2,7 +2,6 @@ import { Store } from '@ngrx/store';
 import { CoreState } from '../../core.reducers';
 import { ObjectUpdatesService } from './object-updates.service';
 import {
-  AddPageToCustomOrderAction,
   DiscardObjectUpdatesAction,
   FieldChangeType,
   InitializeFieldsAction, ReinstateObjectUpdatesAction, RemoveFieldUpdateAction, SelectVirtualMetadataAction,
@@ -13,8 +12,6 @@ import { Notification } from '../../../shared/notifications/models/notification.
 import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { OBJECT_UPDATES_TRASH_PATH } from './object-updates.reducer';
 import {Relationship} from '../../shared/item-relationships/relationship.model';
-import { MoveOperation } from 'fast-json-patch/lib/core';
-import { ArrayMoveChangeAnalyzer } from '../array-move-change-analyzer.service';
 
 describe('ObjectUpdatesService', () => {
   let service: ObjectUpdatesService;
@@ -47,7 +44,7 @@ describe('ObjectUpdatesService', () => {
     };
     store = new Store<CoreState>(undefined, undefined, undefined);
     spyOn(store, 'dispatch');
-    service = new ObjectUpdatesService(store, new ArrayMoveChangeAnalyzer<string>());
+    service = new ObjectUpdatesService(store);
 
     spyOn(service as any, 'getObjectEntry').and.returnValue(observableOf(objectEntry));
     spyOn(service as any, 'getFieldState').and.callFake((uuid) => {
@@ -63,25 +60,6 @@ describe('ObjectUpdatesService', () => {
     });
   });
 
-  describe('initializeWithCustomOrder', () => {
-    const pageSize = 20;
-    const page = 0;
-
-    it('should dispatch an INITIALIZE action with the correct URL, initial identifiables, last modified , custom order, page size and page', () => {
-      service.initializeWithCustomOrder(url, identifiables, modDate, pageSize, page);
-      expect(store.dispatch).toHaveBeenCalledWith(new InitializeFieldsAction(url, identifiables, modDate, identifiables.map((identifiable) => identifiable.uuid), pageSize, page));
-    });
-  });
-
-  describe('addPageToCustomOrder', () => {
-    const page = 2;
-
-    it('should dispatch an ADD_PAGE_TO_CUSTOM_ORDER action with the correct URL, identifiables, custom order and page number to add', () => {
-      service.addPageToCustomOrder(url, identifiables, page);
-      expect(store.dispatch).toHaveBeenCalledWith(new AddPageToCustomOrderAction(url, identifiables, identifiables.map((identifiable) => identifiable.uuid), page));
-    });
-  });
-
   describe('getFieldUpdates', () => {
     it('should return the list of all fields, including their update if there is one', () => {
       const result$ = service.getFieldUpdates(url, identifiables);
@@ -116,49 +94,6 @@ describe('ObjectUpdatesService', () => {
     });
   });
 
-  describe('getFieldUpdatesByCustomOrder', () => {
-    beforeEach(() => {
-      const fieldStates = {
-        [identifiable1.uuid]: { editable: false, isNew: false, isValid: true },
-        [identifiable2.uuid]: { editable: true, isNew: false, isValid: false },
-        [identifiable3.uuid]: { editable: true, isNew: true, isValid: true },
-      };
-
-      const customOrder = {
-        initialOrderPages: [{
-          order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid]
-        }],
-        newOrderPages: [{
-          order: [identifiable2.uuid, identifiable3.uuid, identifiable1.uuid]
-        }],
-        pageSize: 20,
-        changed: true
-      };
-
-      const objectEntry = {
-        fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}, customOrder
-      };
-
-      (service as any).getObjectEntry.and.returnValue(observableOf(objectEntry))
-    });
-
-    it('should return the list of all fields, including their update if there is one, ordered by their custom order', (done) => {
-      const result$ = service.getFieldUpdatesByCustomOrder(url, identifiables);
-      expect((service as any).getObjectEntry).toHaveBeenCalledWith(url);
-
-      const expectedResult = {
-        [identifiable2.uuid]: { field: identifiable2, changeType: undefined },
-        [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD },
-        [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE }
-      };
-
-      result$.subscribe((result) => {
-        expect(result).toEqual(expectedResult);
-        done();
-      });
-    });
-  });
-
   describe('isEditable', () => {
     it('should return false if this identifiable is currently not editable in the store', () => {
       const result$ = service.isEditable(url, identifiable1.uuid);
@@ -274,11 +209,7 @@ describe('ObjectUpdatesService', () => {
     });
     describe('when updates are emtpy', () => {
       beforeEach(() => {
-        (service as any).getObjectEntry.and.returnValue(observableOf({
-          customOrder: {
-            changed: false
-          }
-        }))
+        (service as any).getObjectEntry.and.returnValue(observableOf({}))
       });
 
       it('should return false when there are no updates', () => {
@@ -346,44 +277,4 @@ describe('ObjectUpdatesService', () => {
     });
   });
 
-  describe('getMoveOperations', () => {
-    beforeEach(() => {
-      const fieldStates = {
-        [identifiable1.uuid]: { editable: false, isNew: false, isValid: true },
-        [identifiable2.uuid]: { editable: true, isNew: false, isValid: false },
-        [identifiable3.uuid]: { editable: true, isNew: true, isValid: true },
-      };
-
-      const customOrder = {
-        initialOrderPages: [{
-          order: [identifiable1.uuid, identifiable2.uuid, identifiable3.uuid]
-        }],
-        newOrderPages: [{
-          order: [identifiable2.uuid, identifiable3.uuid, identifiable1.uuid]
-        }],
-        pageSize: 20,
-        changed: true
-      };
-
-      const objectEntry = {
-        fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}, customOrder
-      };
-
-      (service as any).getObjectEntry.and.returnValue(observableOf(objectEntry))
-    });
-
-    it('should return the expected move operations', (done) => {
-      const result$ = service.getMoveOperations(url);
-
-      const expectedResult = [
-        { op: 'move', from: '/0', path: '/2' }
-      ] as MoveOperation[];
-
-      result$.subscribe((result) => {
-        expect(result).toEqual(expectedResult);
-        done();
-      });
-    });
-  });
-
 });
diff --git a/src/app/core/data/object-updates/object-updates.service.ts b/src/app/core/data/object-updates/object-updates.service.ts
index c9a7f47e81..84f0f06035 100644
--- a/src/app/core/data/object-updates/object-updates.service.ts
+++ b/src/app/core/data/object-updates/object-updates.service.ts
@@ -8,16 +8,15 @@ import {
   Identifiable,
   OBJECT_UPDATES_TRASH_PATH,
   ObjectUpdatesEntry,
-  ObjectUpdatesState, OrderPage,
+  ObjectUpdatesState,
   VirtualMetadataSource
 } from './object-updates.reducer';
 import { Observable } from 'rxjs';
 import {
-  AddFieldUpdateAction, AddPageToCustomOrderAction,
+  AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
   FieldChangeType,
   InitializeFieldsAction,
-  MoveFieldUpdateAction,
   ReinstateObjectUpdatesAction,
   RemoveFieldUpdateAction,
   SelectVirtualMetadataAction,
@@ -25,11 +24,8 @@ import {
   SetValidFieldUpdateAction
 } from './object-updates.actions';
 import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
+import { hasNoValue, hasValue, isEmpty, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
 import { INotification } from '../../../shared/notifications/models/notification.model';
-import { ArrayMoveChangeAnalyzer } from '../array-move-change-analyzer.service';
-import { MoveOperation } from 'fast-json-patch/lib/core';
-import { flatten } from '@angular/compiler';
 
 function objectUpdatesStateSelector(): MemoizedSelector<CoreState, ObjectUpdatesState> {
   return createSelector(coreSelector, (state: CoreState) => state['cache/object-updates']);
@@ -52,9 +48,7 @@ function virtualMetadataSourceSelector(url: string, source: string): MemoizedSel
  */
 @Injectable()
 export class ObjectUpdatesService {
-  constructor(private store: Store<CoreState>,
-              private comparator: ArrayMoveChangeAnalyzer<string>) {
-
+  constructor(private store: Store<CoreState>) {
   }
 
   /**
@@ -67,28 +61,6 @@ export class ObjectUpdatesService {
     this.store.dispatch(new InitializeFieldsAction(url, fields, lastModified));
   }
 
-  /**
-   * Method to dispatch an InitializeFieldsAction to the store and keeping track of the order objects are stored
-   * @param url The page's URL for which the changes are being mapped
-   * @param fields The initial fields for the page's object
-   * @param lastModified The date the object was last modified
-   * @param pageSize The page size to use for adding pages to the custom order
-   * @param page The first page to populate the custom order with
-   */
-  initializeWithCustomOrder(url, fields: Identifiable[], lastModified: Date, pageSize = 9999, page = 0): void {
-    this.store.dispatch(new InitializeFieldsAction(url, fields, lastModified, fields.map((field) => field.uuid), pageSize, page));
-  }
-
-  /**
-   * Method to dispatch an AddPageToCustomOrderAction, adding a new page to an already existing custom order tracking
-   * @param url     The URL for which the changes are being mapped
-   * @param fields  The fields to add a new page for
-   * @param page    The page number (starting from index 0)
-   */
-  addPageToCustomOrder(url, fields: Identifiable[], page: number): void {
-    this.store.dispatch(new AddPageToCustomOrderAction(url, fields, fields.map((field) => field.uuid), page));
-  }
-
   /**
    * Method to dispatch an AddFieldUpdateAction to the store
    * @param url The page's URL for which the changes are saved
@@ -153,7 +125,7 @@ export class ObjectUpdatesService {
    */
   getFieldUpdatesExclusive(url: string, initialFields: Identifiable[]): Observable<FieldUpdates> {
     const objectUpdates = this.getObjectEntry(url);
-    return objectUpdates.pipe(map((objectEntry) => {
+    return objectUpdates.pipe(isNotEmptyOperator(), map((objectEntry) => {
       const fieldUpdates: FieldUpdates = {};
       for (const object of initialFields) {
         let fieldUpdate = objectEntry.fieldUpdates[object.uuid];
@@ -166,31 +138,6 @@ export class ObjectUpdatesService {
     }))
   }
 
-  /**
-   * Method that combines the state's updates with the initial values (when there's no update),
-   * sorted by their custom order to create a FieldUpdates object
-   * @param url The URL of the page for which the FieldUpdates should be requested
-   * @param initialFields The initial values of the fields
-   * @param page The page to retrieve
-   */
-  getFieldUpdatesByCustomOrder(url: string, initialFields: Identifiable[], page = 0): Observable<FieldUpdates> {
-    const objectUpdates = this.getObjectEntry(url);
-    return objectUpdates.pipe(map((objectEntry) => {
-      const fieldUpdates: FieldUpdates = {};
-      if (hasValue(objectEntry) && hasValue(objectEntry.customOrder) && isNotEmpty(objectEntry.customOrder.newOrderPages) && page < objectEntry.customOrder.newOrderPages.length) {
-        for (const uuid of objectEntry.customOrder.newOrderPages[page].order) {
-          let fieldUpdate = objectEntry.fieldUpdates[uuid];
-          if (isEmpty(fieldUpdate)) {
-            const identifiable = initialFields.find((object: Identifiable) => object.uuid === uuid);
-            fieldUpdate = {field: identifiable, changeType: undefined};
-          }
-          fieldUpdates[uuid] = fieldUpdate;
-        }
-      }
-      return fieldUpdates;
-    }))
-  }
-
   /**
    * Method to check if a specific field is currently editable in the store
    * @param url The URL of the page on which the field resides
@@ -260,19 +207,6 @@ export class ObjectUpdatesService {
     this.saveFieldUpdate(url, field, FieldChangeType.UPDATE);
   }
 
-  /**
-   * Dispatches a MoveFieldUpdateAction
-   * @param url       The page's URL for which the changes are saved
-   * @param from      The index of the object to move
-   * @param to        The index to move the object to
-   * @param fromPage  The page to move the object from
-   * @param toPage    The page to move the object to
-   * @param field     Optional field to add to the fieldUpdates list (useful if we want to track updates across multiple pages)
-   */
-  saveMoveFieldUpdate(url: string, from: number, to: number, fromPage = 0, toPage = 0, field?: Identifiable) {
-    this.store.dispatch(new MoveFieldUpdateAction(url, from, to, fromPage, toPage, field));
-  }
-
   /**
    * Check whether the virtual metadata of a given item is selected to be saved as real metadata
    * @param url           The URL of the page on which the field resides
@@ -387,7 +321,7 @@ export class ObjectUpdatesService {
    * @param url The page's url to check for in the store
    */
   hasUpdates(url: string): Observable<boolean> {
-    return this.getObjectEntry(url).pipe(map((objectEntry) => hasValue(objectEntry) && (isNotEmpty(objectEntry.fieldUpdates) || objectEntry.customOrder.changed)));
+    return this.getObjectEntry(url).pipe(map((objectEntry) => hasValue(objectEntry) && isNotEmpty(objectEntry.fieldUpdates)));
   }
 
   /**
@@ -405,19 +339,4 @@ export class ObjectUpdatesService {
   getLastModified(url: string): Observable<Date> {
     return this.getObjectEntry(url).pipe(map((entry: ObjectUpdatesEntry) => entry.lastModified));
   }
-
-  /**
-   * Get move operations based on the custom order
-   * @param url The page's url
-   */
-  getMoveOperations(url: string): Observable<MoveOperation[]> {
-    return this.getObjectEntry(url).pipe(
-      map((objectEntry) => objectEntry.customOrder),
-      map((customOrder) => this.comparator.diff(
-        flatten(customOrder.initialOrderPages.map((orderPage: OrderPage) => orderPage.order)),
-        flatten(customOrder.newOrderPages.map((orderPage: OrderPage) => orderPage.order)))
-      )
-    );
-  }
-
 }
diff --git a/src/app/core/data/process-files-response-parsing.service.ts b/src/app/core/data/process-files-response-parsing.service.ts
new file mode 100644
index 0000000000..0fa7c66869
--- /dev/null
+++ b/src/app/core/data/process-files-response-parsing.service.ts
@@ -0,0 +1,41 @@
+import { ResponseParsingService } from './parsing.service';
+import { RestRequest } from './request.models';
+import { GenericSuccessResponse, RestResponse } from '../cache/response.models';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { PaginatedList } from './paginated-list';
+import { PageInfo } from '../shared/page-info.model';
+import { Injectable } from '@angular/core';
+import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
+import { Bitstream } from '../shared/bitstream.model';
+
+@Injectable()
+/**
+ * A ResponseParsingService used to parse DSpaceRESTV2Response coming from the REST API to a GenericSuccessResponse
+ * containing a PaginatedList of a process's output files
+ */
+export class ProcessFilesResponseParsingService implements ResponseParsingService {
+  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+    const payload = data.payload;
+
+    let page;
+    if (isNotEmpty(payload._embedded) && isNotEmpty(Object.keys(payload._embedded))) {
+      const bitstreams = new DSpaceSerializer(Bitstream).deserializeArray(payload._embedded[Object.keys(payload._embedded)[0]]);
+
+      if (isNotEmpty(bitstreams)) {
+        page = new PaginatedList(Object.assign(new PageInfo(), {
+          elementsPerPage: bitstreams.length,
+          totalElements: bitstreams.length,
+          totalPages: 1,
+          currentPage: 1
+        }), bitstreams);
+      }
+    }
+
+    if (isEmpty(page)) {
+      page = new PaginatedList(new PageInfo(), []);
+    }
+
+    return new GenericSuccessResponse(page, data.statusCode, data.statusText);
+  }
+}
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
new file mode 100644
index 0000000000..48c1d502cc
--- /dev/null
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -0,0 +1,70 @@
+import { Injectable } from '@angular/core';
+import { DataService } from '../data.service';
+import { RequestService } from '../request.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
+import { Process } from '../../../process-page/processes/process.model';
+import { dataService } from '../../cache/builders/build-decorators';
+import { PROCESS } from '../../../process-page/processes/process.resource-type';
+import { Observable } from 'rxjs/internal/Observable';
+import { map, switchMap } from 'rxjs/operators';
+import { ProcessFilesRequest, RestRequest } from '../request.models';
+import { configureRequest, filterSuccessfulResponses } from '../../shared/operators';
+import { GenericSuccessResponse } from '../../cache/response.models';
+import { PaginatedList } from '../paginated-list';
+import { Bitstream } from '../../shared/bitstream.model';
+import { RemoteData } from '../remote-data';
+
+@Injectable()
+@dataService(PROCESS)
+export class ProcessDataService extends DataService<Process> {
+  protected linkPath = 'processes';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<Process>) {
+    super();
+  }
+
+  /**
+   * Get the endpoint for a process his files
+   * @param processId The ID of the process
+   */
+  getFilesEndpoint(processId: string): Observable<string> {
+    return this.getBrowseEndpoint().pipe(
+      switchMap((href) => this.halService.getEndpoint('files', `${href}/${processId}`))
+    );
+  }
+
+  /**
+   * Get a process his output files
+   * @param processId The ID of the process
+   */
+  getFiles(processId: string): Observable<RemoteData<PaginatedList<Bitstream>>> {
+    const request$ = this.getFilesEndpoint(processId).pipe(
+      map((href) => new ProcessFilesRequest(this.requestService.generateRequestId(), href)),
+      configureRequest(this.requestService)
+    );
+    const requestEntry$ = request$.pipe(
+      switchMap((request: RestRequest) => this.requestService.getByHref(request.href))
+    );
+    const payload$ = requestEntry$.pipe(
+      filterSuccessfulResponses(),
+      map((response: GenericSuccessResponse<PaginatedList<Bitstream>>) => response.payload)
+    );
+
+    return this.rdbService.toRemoteDataObservable(requestEntry$, payload$);
+  }
+}
diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts
new file mode 100644
index 0000000000..6600444ea0
--- /dev/null
+++ b/src/app/core/data/processes/script-data.service.ts
@@ -0,0 +1,61 @@
+import { Injectable } from '@angular/core';
+import { DataService } from '../data.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../default-change-analyzer.service';
+import { Script } from '../../../process-page/scripts/script.model';
+import { ProcessParameter } from '../../../process-page/processes/process-parameter.model';
+import { find, map, switchMap } from 'rxjs/operators';
+import { URLCombiner } from '../../url-combiner/url-combiner';
+import { MultipartPostRequest, RestRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { Observable } from 'rxjs';
+import { RequestEntry } from '../request.reducer';
+import { dataService } from '../../cache/builders/build-decorators';
+import { SCRIPT } from '../../../process-page/scripts/script.resource-type';
+
+@Injectable()
+@dataService(SCRIPT)
+export class ScriptDataService extends DataService<Script> {
+  protected linkPath = 'scripts';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<Script>) {
+    super();
+  }
+
+  public invoke(scriptName: string, parameters: ProcessParameter[], files: File[]): Observable<RequestEntry> {
+    const requestId = this.requestService.generateRequestId();
+    return this.getBrowseEndpoint().pipe(
+      map((endpoint: string) => new URLCombiner(endpoint, scriptName, 'processes').toString()),
+      map((endpoint: string) => {
+        const body = this.getInvocationFormData(parameters, files);
+        return new MultipartPostRequest(requestId, endpoint, body)
+      }),
+      map((request: RestRequest) => this.requestService.configure(request)),
+      switchMap(() => this.requestService.getByUUID(requestId)),
+      find((request: RequestEntry) => request.completed)
+    );
+  }
+
+  private getInvocationFormData(parameters: ProcessParameter[], files: File[]): FormData {
+    const form: FormData = new FormData();
+    form.set('properties', JSON.stringify(parameters));
+    files.forEach((file: File) => {
+      form.append('file', file);
+    });
+    return form;
+  }
+}
diff --git a/src/app/core/data/registration-response-parsing.service.spec.ts b/src/app/core/data/registration-response-parsing.service.spec.ts
new file mode 100644
index 0000000000..52044798a3
--- /dev/null
+++ b/src/app/core/data/registration-response-parsing.service.spec.ts
@@ -0,0 +1,22 @@
+import { Registration } from '../shared/registration.model';
+import { RegistrationResponseParsingService } from './registration-response-parsing.service';
+import { RegistrationSuccessResponse } from '../cache/response.models';
+
+describe('RegistrationResponseParsingService', () => {
+  describe('parse', () => {
+    const registration = Object.assign(new Registration(), {email: 'test@email.org', token: 'test-token'});
+    const registrationResponseParsingService = new RegistrationResponseParsingService();
+
+    const data = {
+      payload: {email: 'test@email.org', token: 'test-token'},
+      statusCode: 200,
+      statusText: 'Success'
+    };
+
+    it('should parse a registration response', () => {
+      const expected = registrationResponseParsingService.parse({} as any, data);
+
+      expect(expected).toEqual(new RegistrationSuccessResponse(registration, 200, 'Success'));
+    });
+  });
+});
diff --git a/src/app/core/data/registration-response-parsing.service.ts b/src/app/core/data/registration-response-parsing.service.ts
new file mode 100644
index 0000000000..8f5c35a3e1
--- /dev/null
+++ b/src/app/core/data/registration-response-parsing.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { RegistrationSuccessResponse, RestResponse } from '../cache/response.models';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { ResponseParsingService } from './parsing.service';
+import { RestRequest } from './request.models';
+import { Registration } from '../shared/registration.model';
+
+@Injectable({
+  providedIn: 'root',
+})
+/**
+ * Parsing service responsible for parsing a Registration response
+ */
+export class RegistrationResponseParsingService implements ResponseParsingService {
+
+  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+    const payload = data.payload;
+
+    const registration = Object.assign(new Registration(), payload);
+
+    return new RegistrationSuccessResponse(registration, data.statusCode, data.statusText);
+  }
+
+}
diff --git a/src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts b/src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts
deleted file mode 100644
index 6cc031f3c9..0000000000
--- a/src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { PageInfo } from '../shared/page-info.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import {
-  RegistryBitstreamformatsSuccessResponse
-} from '../cache/response.models';
-import { RegistryBitstreamformatsResponseParsingService } from './registry-bitstreamformats-response-parsing.service';
-
-describe('RegistryBitstreamformatsResponseParsingService', () => {
-  let service: RegistryBitstreamformatsResponseParsingService;
-
-  const mockDSOParser = Object.assign({
-    processPageInfo: () => new PageInfo()
-  }) as DSOResponseParsingService;
-
-  const data = Object.assign({
-    payload: {
-      _embedded: {
-        bitstreamformats: [
-          {
-            uuid: 'uuid-1',
-            description: 'a description'
-          },
-          {
-            uuid: 'uuid-2',
-            description: 'another description'
-          },
-        ]
-      }
-    }
-  }) as DSpaceRESTV2Response;
-
-  beforeEach(() => {
-    service = new RegistryBitstreamformatsResponseParsingService(mockDSOParser);
-  });
-
-  it('should parse the data correctly', () => {
-    const response = service.parse(null, data);
-    expect(response.constructor).toBe(RegistryBitstreamformatsSuccessResponse);
-  });
-});
diff --git a/src/app/core/data/registry-bitstreamformats-response-parsing.service.ts b/src/app/core/data/registry-bitstreamformats-response-parsing.service.ts
deleted file mode 100644
index 1cbcf358e3..0000000000
--- a/src/app/core/data/registry-bitstreamformats-response-parsing.service.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Injectable } from '@angular/core';
-import { RegistryBitstreamformatsSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class RegistryBitstreamformatsResponseParsingService implements ResponseParsingService {
-  constructor(private dsoParser: DSOResponseParsingService) {
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    const bitstreamformats = payload._embedded.bitstreamformats;
-    payload.bitstreamformats = bitstreamformats;
-
-    const deserialized = new DSpaceSerializer(RegistryBitstreamformatsResponse).deserialize(payload);
-    return new RegistryBitstreamformatsSuccessResponse(deserialized, data.statusCode, data.statusText, this.dsoParser.processPageInfo(data.payload.page));
-  }
-
-}
diff --git a/src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts b/src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts
deleted file mode 100644
index 5ede21954a..0000000000
--- a/src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { PageInfo } from '../shared/page-info.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import {
-  RegistryMetadatafieldsSuccessResponse
-} from '../cache/response.models';
-import { RegistryMetadatafieldsResponseParsingService } from './registry-metadatafields-response-parsing.service';
-
-describe('RegistryMetadatafieldsResponseParsingService', () => {
-  let service: RegistryMetadatafieldsResponseParsingService;
-
-  const mockDSOParser = Object.assign({
-    processPageInfo: () => new PageInfo()
-  }) as DSOResponseParsingService;
-
-  const data = Object.assign({
-    payload: {
-      _embedded: {
-        metadatafields: [
-          {
-            id: 1,
-            element: 'element',
-            qualifier: 'qualifier',
-            scopeNote: 'a scope note',
-            _embedded: {
-              schema: {
-                id: 1,
-                prefix: 'test',
-                namespace: 'test namespace'
-              }
-            }
-          },
-          {
-            id: 2,
-            element: 'secondelement',
-            qualifier: 'secondqualifier',
-            scopeNote: 'a second scope note',
-            _embedded: {
-              schema: {
-                id: 1,
-                prefix: 'test',
-                namespace: 'test namespace'
-              }
-            }
-          },
-        ]
-      }
-    }
-  }) as DSpaceRESTV2Response;
-
-  const emptyData = Object.assign({
-    payload: {}
-  }) as DSpaceRESTV2Response;
-
-  beforeEach(() => {
-    service = new RegistryMetadatafieldsResponseParsingService(mockDSOParser);
-  });
-
-  it('should parse the data correctly', () => {
-    const response = service.parse(null, data);
-    expect(response.constructor).toBe(RegistryMetadatafieldsSuccessResponse);
-  });
-
-  it('should not produce an error and parse the data correctly when the data is empty', () => {
-    const response = service.parse(null, emptyData);
-    expect(response.constructor).toBe(RegistryMetadatafieldsSuccessResponse);
-  });
-});
diff --git a/src/app/core/data/registry-metadatafields-response-parsing.service.ts b/src/app/core/data/registry-metadatafields-response-parsing.service.ts
deleted file mode 100644
index cf9484c4c4..0000000000
--- a/src/app/core/data/registry-metadatafields-response-parsing.service.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Injectable } from '@angular/core';
-import { hasValue } from '../../shared/empty.util';
-import { RegistryMetadatafieldsSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class RegistryMetadatafieldsResponseParsingService implements ResponseParsingService {
-  constructor(private dsoParser: DSOResponseParsingService) {
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    let metadatafields = [];
-
-    if (hasValue(payload._embedded)) {
-      metadatafields = payload._embedded.metadatafields;
-      metadatafields.forEach((field) => {
-        field.schema = field._embedded.schema;
-      });
-    }
-
-    payload.metadatafields = metadatafields;
-
-    const deserialized = new DSpaceSerializer(RegistryMetadatafieldsResponse).deserialize(payload);
-    return new RegistryMetadatafieldsSuccessResponse(deserialized, data.statusCode, data.statusText, this.dsoParser.processPageInfo(data.payload));
-  }
-
-}
diff --git a/src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts b/src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts
deleted file mode 100644
index e49305d06a..0000000000
--- a/src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { RegistryMetadataschemasResponseParsingService } from './registry-metadataschemas-response-parsing.service';
-import { PageInfo } from '../shared/page-info.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { RegistryMetadataschemasSuccessResponse } from '../cache/response.models';
-
-describe('RegistryMetadataschemasResponseParsingService', () => {
-  let service: RegistryMetadataschemasResponseParsingService;
-
-  const mockDSOParser = Object.assign({
-    processPageInfo: () => new PageInfo()
-  }) as DSOResponseParsingService;
-
-  const data = Object.assign({
-    payload: {
-      _embedded: {
-        metadataschemas: [
-          {
-            id: 1,
-            prefix: 'test',
-            namespace: 'test namespace'
-          },
-          {
-            id: 2,
-            prefix: 'second',
-            namespace: 'second test namespace'
-          }
-        ]
-      }
-    }
-  }) as DSpaceRESTV2Response;
-
-  const emptyData = Object.assign({
-    payload: {}
-  }) as DSpaceRESTV2Response;
-
-  beforeEach(() => {
-    service = new RegistryMetadataschemasResponseParsingService(mockDSOParser);
-  });
-
-  it('should parse the data correctly', () => {
-    const response = service.parse(null, data);
-    expect(response.constructor).toBe(RegistryMetadataschemasSuccessResponse);
-  });
-
-  it('should not produce an error and parse the data correctly when the data is empty', () => {
-    const response = service.parse(null, emptyData);
-    expect(response.constructor).toBe(RegistryMetadataschemasSuccessResponse);
-  });
-});
diff --git a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
deleted file mode 100644
index 416ed19dc2..0000000000
--- a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Injectable } from '@angular/core';
-import { hasValue } from '../../shared/empty.util';
-import { RegistryMetadataschemasSuccessResponse, RestResponse } from '../cache/response.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
-import { DSOResponseParsingService } from './dso-response-parsing.service';
-import { ResponseParsingService } from './parsing.service';
-import { RestRequest } from './request.models';
-
-@Injectable()
-export class RegistryMetadataschemasResponseParsingService implements ResponseParsingService {
-  constructor(private dsoParser: DSOResponseParsingService) {
-  }
-
-  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    const payload = data.payload;
-
-    let metadataschemas = [];
-    if (hasValue(payload._embedded)) {
-      metadataschemas = payload._embedded.metadataschemas;
-    }
-    payload.metadataschemas = metadataschemas;
-
-    const deserialized = new DSpaceSerializer(RegistryMetadataschemasResponse).deserialize(payload);
-    return new RegistryMetadataschemasSuccessResponse(deserialized, data.statusCode, data.statusText, this.dsoParser.processPageInfo(data.payload));
-  }
-
-}
diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts
index 7f793f4ac4..44d8416f35 100644
--- a/src/app/core/data/request.effects.ts
+++ b/src/app/core/data/request.effects.ts
@@ -11,12 +11,7 @@ import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.
 
 import { DSpaceRESTv2Service } from '../dspace-rest-v2/dspace-rest-v2.service';
 import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
-import {
-  RequestActionTypes,
-  RequestCompleteAction,
-  RequestExecuteAction,
-  ResetResponseTimestampsAction
-} from './request.actions';
+import { RequestActionTypes, RequestCompleteAction, RequestExecuteAction, ResetResponseTimestampsAction } from './request.actions';
 import { RequestError, RestRequest } from './request.models';
 import { RequestEntry } from './request.reducer';
 import { RequestService } from './request.service';
@@ -42,12 +37,12 @@ export class RequestEffects {
     filter((entry: RequestEntry) => hasValue(entry)),
     map((entry: RequestEntry) => entry.request),
     flatMap((request: RestRequest) => {
-      let body;
-      if (isNotEmpty(request.body)) {
+      let body = request.body;
+      if (isNotEmpty(request.body) && !request.isMultipart) {
         const serializer = new DSpaceSerializer(getClassForType(request.body.type));
         body = serializer.serialize(request.body);
       }
-      return this.restApi.request(request.method, request.href, body, request.options).pipe(
+      return this.restApi.request(request.method, request.href, body, request.options, request.isMultipart).pipe(
         map((data: DSpaceRESTV2Response) => this.injector.get(request.getResponseParser()).parse(request, data)),
         addToResponseCacheAndCompleteAction(request),
         catchError((error: RequestError) => observableOf(new ErrorResponse(error)).pipe(
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 5866cce797..bd497d4ddb 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -14,12 +14,12 @@ import { RestRequestMethod } from './rest-request-method';
 import { RequestParam } from '../cache/models/request-param.model';
 import { EpersonResponseParsingService } from '../eperson/eperson-response-parsing.service';
 import { BrowseItemsResponseParsingService } from './browse-items-response-parsing-service';
-import { MetadataschemaParsingService } from './metadataschema-parsing.service';
-import { MetadatafieldParsingService } from './metadatafield-parsing.service';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { TaskResponseParsingService } from '../tasks/task-response-parsing.service';
 import { ContentSourceResponseParsingService } from './content-source-response-parsing.service';
 import { MappedCollectionsReponseParsingService } from './mapped-collections-reponse-parsing.service';
+import { ProcessFilesResponseParsingService } from './process-files-response-parsing.service';
+import { TokenResponseParsingService } from '../auth/token-response-parsing.service';
 
 /* tslint:disable:max-classes-per-file */
 
@@ -32,6 +32,8 @@ export enum IdentifierType {
 export abstract class RestRequest {
   public responseMsToLive = 10 * 1000;
   public forceBypassCache = false;
+  public isMultipart = false;
+
   constructor(
     public uuid: string,
     public href: string,
@@ -74,6 +76,21 @@ export class PostRequest extends RestRequest {
   }
 }
 
+/**
+ * Request representing a multipart post request
+ */
+export class MultipartPostRequest extends RestRequest {
+  public isMultipart = true;
+  constructor(
+    public uuid: string,
+    public href: string,
+    public body?: any,
+    public options?: HttpOptions
+  )  {
+    super(uuid, href, RestRequestMethod.POST, body)
+  }
+}
+
 export class PutRequest extends RestRequest {
   constructor(
     public uuid: string,
@@ -209,6 +226,15 @@ export class MappedCollectionsRequest extends GetRequest {
   }
 }
 
+/**
+ * Request to fetch the files of a process
+ */
+export class ProcessFilesRequest extends GetRequest {
+  getResponseParser(): GenericConstructor<ResponseParsingService> {
+    return ProcessFilesResponseParsingService;
+  }
+}
+
 export class ConfigRequest extends GetRequest {
   constructor(uuid: string, href: string, public options?: HttpOptions) {
     super(uuid, href, null, options);
@@ -241,6 +267,15 @@ export class AuthGetRequest extends GetRequest {
   }
 }
 
+/**
+ * A POST request for retrieving a token
+ */
+export class TokenPostRequest extends PostRequest {
+  getResponseParser(): GenericConstructor<ResponseParsingService> {
+    return TokenResponseParsingService;
+  }
+}
+
 export class IntegrationRequest extends GetRequest {
   constructor(uuid: string, href: string) {
     super(uuid, href);
@@ -251,58 +286,6 @@ export class IntegrationRequest extends GetRequest {
   }
 }
 
-/**
- * Request to create a MetadataSchema
- */
-export class CreateMetadataSchemaRequest extends PostRequest {
-  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
-    super(uuid, href, body, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return MetadataschemaParsingService;
-  }
-}
-
-/**
- * Request to update a MetadataSchema
- */
-export class UpdateMetadataSchemaRequest extends PutRequest {
-  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
-    super(uuid, href, body, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return MetadataschemaParsingService;
-  }
-}
-
-/**
- * Request to create a MetadataField
- */
-export class CreateMetadataFieldRequest extends PostRequest {
-  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
-    super(uuid, href, body, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return MetadatafieldParsingService;
-  }
-}
-
-/**
- * Request to update a MetadataField
- */
-export class UpdateMetadataFieldRequest extends PutRequest {
-  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
-    super(uuid, href, body, options);
-  }
-
-  getResponseParser(): GenericConstructor<ResponseParsingService> {
-    return MetadatafieldParsingService;
-  }
-}
-
 /**
  * Class representing a submission HTTP GET request object
  */
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 105d84cf4a..9a2c565301 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -201,8 +201,9 @@ export class RequestService {
    * Remove all request cache providing (part of) the href
    * This also includes href-to-uuid index cache
    * @param href    A substring of the request(s) href
+   * @return        Returns an observable emitting whether or not the cache is removed
    */
-  removeByHrefSubstring(href: string) {
+  removeByHrefSubstring(href: string): Observable<boolean> {
     this.store.pipe(
       select(uuidsFromHrefSubstringSelector(requestIndexSelector, href)),
       take(1)
@@ -213,6 +214,11 @@ export class RequestService {
     });
     this.requestsOnTheirWayToTheStore = this.requestsOnTheirWayToTheStore.filter((reqHref: string) => reqHref.indexOf(href) < 0);
     this.indexStore.dispatch(new RemoveFromIndexBySubstringAction(IndexName.REQUEST, href));
+
+    return this.store.pipe(
+      select(uuidsFromHrefSubstringSelector(requestIndexSelector, href)),
+      map((uuids) => isEmpty(uuids))
+    );
   }
 
   /**
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
index 6eb144580c..8cb730c358 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
+++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
@@ -69,10 +69,12 @@ export class DSpaceRESTv2Service {
    *    an optional body for the request
    * @param options
    *    the HttpOptions object
+   * @param isMultipart
+   *     true when this concerns a multipart request
    * @return {Observable<string>}
    *      An Observable<string> containing the response from the server
    */
-  request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions): Observable<DSpaceRESTV2Response> {
+  request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions, isMultipart?: boolean): Observable<DSpaceRESTV2Response> {
     const requestOptions: HttpOptions = {};
     requestOptions.body = body;
     if (method === RestRequestMethod.POST && isNotEmpty(body) && isNotEmpty(body.name)) {
@@ -98,7 +100,7 @@ export class DSpaceRESTv2Service {
       requestOptions.withCredentials = options.withCredentials;
     }
 
-    if (!requestOptions.headers.has('Content-Type')) {
+    if (!requestOptions.headers.has('Content-Type') && !isMultipart) {
       // Because HttpHeaders is immutable, the set method returns a new object instead of updating the existing headers
       requestOptions.headers = requestOptions.headers.set('Content-Type', DEFAULT_CONTENT_TYPE);
     }
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index 0cb56f14a2..a1a6951545 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -14,7 +14,7 @@ import { CoreState } from '../core.reducers';
 import { ChangeAnalyzer } from '../data/change-analyzer';
 import { PaginatedList } from '../data/paginated-list';
 import { RemoteData } from '../data/remote-data';
-import { DeleteByIDRequest, FindListOptions, PatchRequest } from '../data/request.models';
+import { DeleteByIDRequest, FindListOptions, PatchRequest, PostRequest } from '../data/request.models';
 import { RequestEntry } from '../data/request.reducer';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -291,6 +291,25 @@ describe('EPersonDataService', () => {
     });
   });
 
+  describe('createEPersonForToken', () => {
+    it('should sent a postRquest with an eperson to the token endpoint', () => {
+      service.createEPersonForToken(EPersonMock, 'test-token');
+
+      const expected = new PostRequest(requestService.generateRequestId(), epersonsEndpoint + '?token=test-token', EPersonMock);
+      expect(requestService.configure).toHaveBeenCalledWith(expected);
+    });
+  });
+  describe('patchPasswordWithToken', () => {
+    it('should sent a patch request with an uuid, token and new password to the epersons endpoint', () => {
+      service.patchPasswordWithToken('test-uuid', 'test-token','test-password');
+
+      const operation = Object.assign({ op: 'replace', path: '/password', value: 'test-password' });
+      const expected = new PatchRequest(requestService.generateRequestId(), epersonsEndpoint + '/test-uuid?token=test-token', [operation]);
+
+      expect(requestService.configure).toHaveBeenCalledWith(expected);
+    });
+  });
+
 });
 
 function getRemotedataObservable(obj: any): Observable<RemoteData<any>> {
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index 86e53178a0..8723e2dc87 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { createSelector, select, Store } from '@ngrx/store';
 import { Operation } from 'fast-json-patch/lib/core';
 import { Observable } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+import { filter, find, map, take } from 'rxjs/operators';
 import {
   EPeopleRegistryCancelEPersonAction,
   EPeopleRegistryEditEPersonAction
@@ -22,12 +22,13 @@ import { DataService } from '../data/data.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
 import { PaginatedList } from '../data/paginated-list';
 import { RemoteData } from '../data/remote-data';
-import { FindListOptions, FindListRequest, PatchRequest, } from '../data/request.models';
+import { FindListOptions, FindListRequest, PatchRequest, PostRequest, } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { getRemoteDataPayload, getSucceededRemoteData } from '../shared/operators';
 import { EPerson } from './models/eperson.model';
 import { EPERSON } from './models/eperson.resource-type';
+import { RequestEntry } from '../data/request.reducer';
 
 const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
 const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
@@ -165,17 +166,17 @@ export class EPersonDataService extends DataService<EPerson> {
     if (hasValue(oldEPerson.email) && oldEPerson.email !== newEPerson.email) {
       operations = [...operations, {
         op: 'replace', path: '/email', value: newEPerson.email
-      }]
+      }];
     }
     if (hasValue(oldEPerson.requireCertificate) && oldEPerson.requireCertificate !== newEPerson.requireCertificate) {
       operations = [...operations, {
         op: 'replace', path: '/certificate', value: newEPerson.requireCertificate
-      }]
+      }];
     }
     if (hasValue(oldEPerson.canLogIn) && oldEPerson.canLogIn !== newEPerson.canLogIn) {
       operations = [...operations, {
         op: 'replace', path: '/canLogIn', value: newEPerson.canLogIn
-      }]
+      }];
     }
     return operations;
   }
@@ -200,7 +201,7 @@ export class EPersonDataService extends DataService<EPerson> {
    * Method to retrieve the eperson that is currently being edited
    */
   public getActiveEPerson(): Observable<EPerson> {
-    return this.store.pipe(select(editEPersonSelector))
+    return this.store.pipe(select(editEPersonSelector));
   }
 
   /**
@@ -249,4 +250,54 @@ export class EPersonDataService extends DataService<EPerson> {
     return '/admin/access-control/epeople';
   }
 
+  /**
+   * Create a new EPerson using a token
+   * @param eperson
+   * @param token
+   */
+  public createEPersonForToken(eperson: EPerson, token: string) {
+    const requestId = this.requestService.generateRequestId();
+    const hrefObs = this.getBrowseEndpoint().pipe(
+      map((href: string) => `${href}?token=${token}`));
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new PostRequest(requestId, href, eperson);
+        this.requestService.configure(request);
+      })
+    ).subscribe();
+
+    return this.fetchResponse(requestId);
+
+  }
+
+  /**
+   * Sends a patch request to update an epersons password based on a forgot password token
+   * @param uuid      Uuid of the eperson
+   * @param token     The forgot password token
+   * @param password  The new password value
+   */
+  patchPasswordWithToken(uuid: string, token: string, password: string): Observable<RestResponse> {
+    const requestId = this.requestService.generateRequestId();
+
+    const operation = Object.assign({ op: 'replace', path: '/password', value: password });
+
+    const hrefObs = this.halService.getEndpoint(this.linkPath).pipe(
+      map((endpoint: string) => this.getIDHref(endpoint, uuid)),
+      map((href: string) => `${href}?token=${token}`));
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new PatchRequest(requestId, href, [operation]);
+        this.requestService.configure(request);
+      })
+    ).subscribe();
+
+    return this.requestService.getByUUID(requestId).pipe(
+      find((request: RequestEntry) => request.completed),
+      map((request: RequestEntry) => request.response)
+    );
+  }
+
 }
diff --git a/src/app/core/eperson/models/eperson.model.ts b/src/app/core/eperson/models/eperson.model.ts
index bb99022112..86202f1a55 100644
--- a/src/app/core/eperson/models/eperson.model.ts
+++ b/src/app/core/eperson/models/eperson.model.ts
@@ -57,6 +57,12 @@ export class EPerson extends DSpaceObject {
   @autoserialize
   public selfRegistered: boolean;
 
+  /**
+   * The password of this EPerson
+   */
+  @autoserialize
+  public password: string;
+
   /**
    * Getter to retrieve the EPerson's full name as a string
    */
diff --git a/src/app/core/registry/registry-bitstreamformats-response.model.ts b/src/app/core/registry/registry-bitstreamformats-response.model.ts
deleted file mode 100644
index 4da30b4ffc..0000000000
--- a/src/app/core/registry/registry-bitstreamformats-response.model.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { autoserialize, deserialize } from 'cerialize';
-import { BITSTREAM_FORMAT } from '../shared/bitstream-format.resource-type';
-import { HALLink } from '../shared/hal-link.model';
-import { PageInfo } from '../shared/page-info.model';
-import { BitstreamFormat } from '../shared/bitstream-format.model';
-import { link } from '../cache/builders/build-decorators';
-
-export class RegistryBitstreamformatsResponse {
-  @autoserialize
-  page: PageInfo;
-
-  /**
-   * The {@link HALLink}s for this RegistryBitstreamformatsResponse
-   */
-  @deserialize
-  _links: {
-    self: HALLink;
-    bitstreamformats: HALLink;
-  };
-
-  @link(BITSTREAM_FORMAT)
-  bitstreamformats?: BitstreamFormat[];
-
-}
diff --git a/src/app/core/registry/registry-metadatafields-response.model.ts b/src/app/core/registry/registry-metadatafields-response.model.ts
deleted file mode 100644
index 5dc492ab0f..0000000000
--- a/src/app/core/registry/registry-metadatafields-response.model.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { autoserialize, deserialize } from 'cerialize';
-import { typedObject } from '../cache/builders/build-decorators';
-import { MetadataField } from '../metadata/metadata-field.model';
-import { METADATA_FIELD } from '../metadata/metadata-field.resource-type';
-import { HALLink } from '../shared/hal-link.model';
-import { PageInfo } from '../shared/page-info.model';
-import { ResourceType } from '../shared/resource-type';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-
-/**
- * Class that represents a response with a registry's metadata fields
- */
-@typedObject
-export class RegistryMetadatafieldsResponse {
-  static type = METADATA_FIELD;
-
-  /**
-   * The object type
-   */
-  @excludeFromEquals
-  @autoserialize
-  type: ResourceType;
-
-  /**
-   * List of metadata fields in the response
-   */
-  @deserialize
-  metadatafields: MetadataField[];
-
-  /**
-   * Page info of this response
-   */
-  @autoserialize
-  page: PageInfo;
-
-  /**
-   * The REST link to this response
-   */
-  @autoserialize
-  self: string;
-
-  @deserialize
-  _links: {
-    self: HALLink,
-  }
-}
diff --git a/src/app/core/registry/registry-metadataschemas-response.model.ts b/src/app/core/registry/registry-metadataschemas-response.model.ts
deleted file mode 100644
index 7a485d8849..0000000000
--- a/src/app/core/registry/registry-metadataschemas-response.model.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { PageInfo } from '../shared/page-info.model';
-import { autoserialize, deserialize } from 'cerialize';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-
-export class RegistryMetadataschemasResponse {
-  @deserialize
-  metadataschemas: MetadataSchema[];
-
-  @autoserialize
-  page: PageInfo;
-
-  @autoserialize
-  self: string;
-}
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index d1d817ff36..203e58136c 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -3,8 +3,7 @@ import { Component } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
 import { Store, StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, of as observableOf } from 'rxjs';
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -17,30 +16,20 @@ import {
   MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
 } from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { StoreMock } from '../../shared/testing/store.mock';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 
-import {
-  RegistryMetadatafieldsSuccessResponse,
-  RegistryMetadataschemasSuccessResponse,
-  RestResponse
-} from '../cache/response.models';
-import { RemoteData } from '../data/remote-data';
-import { RequestEntry } from '../data/request.reducer';
-import { RequestService } from '../data/request.service';
+import { RestResponse } from '../cache/response.models';
 import { MetadataField } from '../metadata/metadata-field.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { PageInfo } from '../shared/page-info.model';
-import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
-import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
 import { RegistryService } from './registry.service';
 import { storeModuleConfig } from '../../app.reducer';
+import { FindListOptions } from '../data/request.models';
+import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
+import { MetadataFieldDataService } from '../data/metadata-field-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -49,211 +38,169 @@ class DummyComponent {
 describe('RegistryService', () => {
   let registryService: RegistryService;
   let mockStore;
-  const pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'registry-service-spec-pagination',
-    pageSize: 20
-  });
+  let metadataSchemaService: MetadataSchemaDataService;
+  let metadataFieldService: MetadataFieldDataService;
 
-  const mockSchemasList = [
-    Object.assign(new MetadataSchema(), {
-      id: 1,
-      _links: {
-        self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1' }
-      },
-      prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/',
-      type: MetadataSchema.type
-    }),
-    Object.assign(new MetadataSchema(), {
-      id: 2,
-      _links: {
-        self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2' }
-      },
-      prefix: 'mock',
-      namespace: 'http://dspace.org/mockschema',
-      type: MetadataSchema.type
-    })
-  ];
-  const mockFieldsList = [
-    Object.assign(new MetadataField(),
-      {
+  let options: FindListOptions;
+  let mockSchemasList: MetadataSchema[];
+  let mockFieldsList: MetadataField[];
+
+  function init() {
+    options = Object.assign(new FindListOptions(), {
+      currentPage: 1,
+      elementsPerPage: 20
+    });
+
+    mockSchemasList = [
+      Object.assign(new MetadataSchema(), {
         id: 1,
         _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8' }
+          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1' }
         },
-        element: 'contributor',
-        qualifier: 'advisor',
-        scopeNote: null,
-        schema: mockSchemasList[0],
-        type: MetadataField.type
+        prefix: 'dc',
+        namespace: 'http://dublincore.org/documents/dcmi-terms/',
+        type: MetadataSchema.type
       }),
-    Object.assign(new MetadataField(),
-      {
+      Object.assign(new MetadataSchema(), {
         id: 2,
         _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9' }
+          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2' }
         },
-        element: 'contributor',
-        qualifier: 'author',
-        scopeNote: null,
-        schema: mockSchemasList[0],
-        type: MetadataField.type
-      }),
-    Object.assign(new MetadataField(),
-      {
-        id: 3,
-        _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10' }
-        },
-        element: 'contributor',
-        qualifier: 'editor',
-        scopeNote: 'test scope note',
-        schema: mockSchemasList[1],
-        type: MetadataField.type
-      }),
-    Object.assign(new MetadataField(),
-      {
-        id: 4,
-        _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11' }
-        },
-        element: 'contributor',
-        qualifier: 'illustrator',
-        scopeNote: null,
-        schema: mockSchemasList[1],
-        type: MetadataField.type
+        prefix: 'mock',
+        namespace: 'http://dspace.org/mockschema',
+        type: MetadataSchema.type
       })
-  ];
+    ];
 
-  const pageInfo = new PageInfo();
-  pageInfo.elementsPerPage = 20;
-  pageInfo.currentPage = 1;
-
-  const endpoint = 'path';
-  const endpointWithParams = `${endpoint}?size=${pageInfo.elementsPerPage}&page=${pageInfo.currentPage - 1}`;
-  const fieldEndpointWithParams = `${endpoint}?schema=${mockSchemasList[0].prefix}&size=${pageInfo.elementsPerPage}&page=${pageInfo.currentPage - 1}`;
-
-  const halServiceStub = {
-    getEndpoint: (link: string) => observableOf(endpoint)
-  };
-
-  const rdbStub = {
-    toRemoteDataObservable: (requestEntryObs: Observable<RequestEntry>, payloadObs: Observable<any>) => {
-      return observableCombineLatest(requestEntryObs,
-        payloadObs).pipe(map(([req, pay]) => {
-          return { req, pay };
+    mockFieldsList = [
+      Object.assign(new MetadataField(),
+        {
+          id: 1,
+          _links: {
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8' }
+          },
+          element: 'contributor',
+          qualifier: 'advisor',
+          scopeNote: null,
+          schema: mockSchemasList[0],
+          type: MetadataField.type
+        }),
+      Object.assign(new MetadataField(),
+        {
+          id: 2,
+          _links: {
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9' }
+          },
+          element: 'contributor',
+          qualifier: 'author',
+          scopeNote: null,
+          schema: mockSchemasList[0],
+          type: MetadataField.type
+        }),
+      Object.assign(new MetadataField(),
+        {
+          id: 3,
+          _links: {
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10' }
+          },
+          element: 'contributor',
+          qualifier: 'editor',
+          scopeNote: 'test scope note',
+          schema: mockSchemasList[1],
+          type: MetadataField.type
+        }),
+      Object.assign(new MetadataField(),
+        {
+          id: 4,
+          _links: {
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11' }
+          },
+          element: 'contributor',
+          qualifier: 'illustrator',
+          scopeNote: null,
+          schema: mockSchemasList[1],
+          type: MetadataField.type
         })
-      );
-    },
-    aggregate: (input: Array<Observable<RemoteData<any>>>): Observable<RemoteData<any[]>> => {
-      return createSuccessfulRemoteDataObject$([]);
-    }
-  };
+    ];
+
+    metadataSchemaService = jasmine.createSpyObj('metadataSchemaService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(mockSchemasList)),
+      findById: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
+      createOrUpdateMetadataSchema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
+      deleteAndReturnResponse: observableOf(new RestResponse(true, 200, 'OK')),
+      clearRequests: observableOf('href')
+    });
+
+    metadataFieldService = jasmine.createSpyObj('metadataFieldService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(mockFieldsList)),
+      findById: createSuccessfulRemoteDataObject$(mockFieldsList[0]),
+      createOrUpdateMetadataField: createSuccessfulRemoteDataObject$(mockFieldsList[0]),
+      deleteAndReturnResponse: observableOf(new RestResponse(true, 200, 'OK')),
+      clearRequests: observableOf('href')
+    });
+  }
 
   beforeEach(() => {
+    init();
     TestBed.configureTestingModule({
       imports: [CommonModule, StoreModule.forRoot({}, storeModuleConfig), TranslateModule.forRoot()],
       declarations: [
         DummyComponent
       ],
       providers: [
-        { provide: RequestService, useValue: getMockRequestService() },
-        { provide: RemoteDataBuildService, useValue: rdbStub },
-        { provide: HALEndpointService, useValue: halServiceStub },
         { provide: Store, useClass: StoreMock },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: MetadataSchemaDataService, useValue: metadataSchemaService },
+        { provide: MetadataFieldDataService, useValue: metadataFieldService },
         RegistryService
       ]
     });
     registryService = TestBed.get(RegistryService);
     mockStore = TestBed.get(Store);
-    spyOn((registryService as any).halService, 'getEndpoint').and.returnValue(observableOf(endpoint));
   });
 
   describe('when requesting metadataschemas', () => {
-    const queryResponse = Object.assign(new RegistryMetadataschemasResponse(), {
-      metadataschemas: mockSchemasList,
-      page: pageInfo
-    });
-    const response = new RegistryMetadataschemasSuccessResponse(queryResponse, 200, 'OK', pageInfo);
-    const responseEntry = Object.assign(new RequestEntry(), { response: response });
+    let result;
 
     beforeEach(() => {
-      (registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
-      /* tslint:disable:no-empty */
-      registryService.getMetadataSchemas(pagination).subscribe((value) => {
+      result = registryService.getMetadataSchemas(options);
+    });
+
+    it('should call metadataSchemaService.findAll', (done) => {
+      result.subscribe(() => {
+        expect(metadataSchemaService.findAll).toHaveBeenCalled();
+        done();
       });
-      /* tslint:enable:no-empty */
-    });
-
-    it('should call getEndpoint on the halService', () => {
-      expect((registryService as any).halService.getEndpoint).toHaveBeenCalled();
-    });
-
-    it('should send out the request on the request service', () => {
-      expect((registryService as any).requestService.configure).toHaveBeenCalled();
-    });
-
-    it('should call getByHref on the request service with the correct request url', () => {
-      expect((registryService as any).requestService.getByHref).toHaveBeenCalledWith(endpointWithParams);
     });
   });
 
   describe('when requesting metadataschema by name', () => {
-    const queryResponse = Object.assign(new RegistryMetadataschemasResponse(), {
-      metadataschemas: mockSchemasList,
-      page: pageInfo
-    });
-    const response = new RegistryMetadataschemasSuccessResponse(queryResponse, 200, 'OK', pageInfo);
-    const responseEntry = Object.assign(new RequestEntry(), { response: response });
+    let result;
 
     beforeEach(() => {
-      (registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
-      /* tslint:disable:no-empty */
-      registryService.getMetadataSchemaByName(mockSchemasList[0].prefix).subscribe((value) => {
+      result = registryService.getMetadataSchemaByName(mockSchemasList[0].prefix);
+    });
+
+    it('should call metadataSchemaService.findById with the correct ID', (done) => {
+      result.subscribe(() => {
+        expect(metadataSchemaService.findById).toHaveBeenCalledWith(`${mockSchemasList[0].id}`);
+        done();
       });
-      /* tslint:enable:no-empty */
-    });
-
-    it('should call getEndpoint on the halService', () => {
-      expect((registryService as any).halService.getEndpoint).toHaveBeenCalled();
-    });
-
-    it('should send out the request on the request service', () => {
-      expect((registryService as any).requestService.configure).toHaveBeenCalled();
-    });
-
-    it('should call getByHref on the request service with the correct request url', () => {
-      expect((registryService as any).requestService.getByHref.calls.argsFor(0)[0]).toContain(endpoint);
     });
   });
 
   describe('when requesting metadatafields', () => {
-    const queryResponse = Object.assign(new RegistryMetadatafieldsResponse(), {
-      metadatafields: mockFieldsList,
-      page: pageInfo
-    });
-    const response = new RegistryMetadatafieldsSuccessResponse(queryResponse, 200, 'OK', pageInfo);
-    const responseEntry = Object.assign(new RequestEntry(), { response: response });
+    let result;
 
     beforeEach(() => {
-      (registryService as any).requestService.getByHref.and.returnValue(observableOf(responseEntry));
-      /* tslint:disable:no-empty */
-      registryService.getMetadataFieldsBySchema(mockSchemasList[0], pagination).subscribe((value) => {
+      result = registryService.getAllMetadataFields();
+    });
+
+    it('should call metadataFieldService.findAll', (done) => {
+      result.subscribe(() => {
+        expect(metadataFieldService.findAll).toHaveBeenCalled();
+        done();
       });
-      /* tslint:enable:no-empty */
-    });
-
-    it('should call getEndpoint on the halService', () => {
-      expect((registryService as any).halService.getEndpoint).toHaveBeenCalled();
-    });
-
-    it('should send out the request on the request service', () => {
-      expect((registryService as any).requestService.configure).toHaveBeenCalled();
-    });
-
-    it('should call getByHref on the request service with the correct request url', () => {
-      expect((registryService as any).requestService.getByHref).toHaveBeenCalledWith(fieldEndpointWithParams);
     });
   });
 
@@ -370,9 +317,10 @@ describe('RegistryService', () => {
       result = registryService.createOrUpdateMetadataSchema(mockSchemasList[0]);
     });
 
-    it('should return the created/updated metadata schema', () => {
+    it('should return the created/updated metadata schema', (done) => {
       result.subscribe((schema: MetadataSchema) => {
         expect(schema).toEqual(mockSchemasList[0]);
+        done();
       });
     });
   });
@@ -384,9 +332,10 @@ describe('RegistryService', () => {
       result = registryService.createOrUpdateMetadataField(mockFieldsList[0]);
     });
 
-    it('should return the created/updated metadata field', () => {
+    it('should return the created/updated metadata field', (done) => {
       result.subscribe((field: MetadataField) => {
         expect(field).toEqual(mockFieldsList[0]);
+        done();
       });
     });
   });
@@ -425,7 +374,7 @@ describe('RegistryService', () => {
     });
 
     it('should remove the requests related to metadata schemas from cache', () => {
-      expect((registryService as any).requestService.removeByHrefSubstring).toHaveBeenCalled();
+      expect(metadataSchemaService.clearRequests).toHaveBeenCalled();
     });
   });
 
@@ -435,7 +384,7 @@ describe('RegistryService', () => {
     });
 
     it('should remove the requests related to metadata fields from cache', () => {
-      expect((registryService as any).requestService.removeByHrefSubstring).toHaveBeenCalled();
+      expect(metadataFieldService.clearRequests).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index fbc42b26f4..79b982da8a 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -2,37 +2,18 @@ import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list';
-import { DSpaceSerializer } from '../dspace-rest-v2/dspace.serializer';
 import { PageInfo } from '../shared/page-info.model';
-import {
-  CreateMetadataFieldRequest,
-  CreateMetadataSchemaRequest,
-  DeleteRequest,
-  GetRequest,
-  RestRequest,
-  UpdateMetadataFieldRequest,
-  UpdateMetadataSchemaRequest
-} from '../data/request.models';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { ResponseParsingService } from '../data/parsing.service';
-import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service';
+import { FindListOptions } from '../data/request.models';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestService } from '../data/request.service';
-import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
 import {
   MetadatafieldSuccessResponse,
   MetadataschemaSuccessResponse,
-  RegistryMetadatafieldsSuccessResponse,
-  RegistryMetadataschemasSuccessResponse,
   RestResponse
 } from '../cache/response.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service';
-import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
-import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { configureRequest, getResponseFromEntry } from '../shared/operators';
+import { hasNoValue, hasValue, hasValueOperator, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import { getAllSucceededRemoteDataPayload, getFirstSucceededRemoteDataPayload } from '../shared/operators';
 import { createSelector, select, Store } from '@ngrx/store';
 import { AppState } from '../../app.reducer';
 import { MetadataRegistryState } from '../../+admin/admin-registries/metadata-registry/metadata-registry.reducers';
@@ -48,15 +29,14 @@ import {
   MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
 } from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
-import { distinctUntilChanged, flatMap, map, take, tap } from 'rxjs/operators';
+import { flatMap, map, tap } from 'rxjs/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
-import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
-import { HttpHeaders } from '@angular/common/http';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { MetadataField } from '../metadata/metadata-field.model';
-import { getClassForType } from '../cache/builders/build-decorators';
+import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
+import { MetadataFieldDataService } from '../data/metadata-field-data.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
 const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -70,221 +50,64 @@ const selectedMetadataFieldsSelector = createSelector(metadataRegistryStateSelec
 @Injectable()
 export class RegistryService {
 
-  private metadataSchemasPath = 'metadataschemas';
-  private metadataFieldsPath = 'metadatafields';
-
-  // private bitstreamFormatsPath = 'bitstreamformats';
-
-  constructor(protected requestService: RequestService,
-              private rdb: RemoteDataBuildService,
-              private halService: HALEndpointService,
-              private store: Store<AppState>,
+  constructor(private store: Store<AppState>,
               private notificationsService: NotificationsService,
-              private translateService: TranslateService) {
+              private translateService: TranslateService,
+              private metadataSchemaService: MetadataSchemaDataService,
+              private metadataFieldService: MetadataFieldDataService) {
 
   }
 
   /**
    * Retrieves all metadata schemas
-   * @param pagination The pagination info used to retrieve the schemas
+   * @param options The options used to retrieve the schemas
+   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  public getMetadataSchemas(pagination: PaginationComponentOptions): Observable<RemoteData<PaginatedList<MetadataSchema>>> {
-    const requestObs = this.getMetadataSchemasRequestObs(pagination);
-
-    const requestEntryObs = requestObs.pipe(
-      flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-
-    const rmrObs: Observable<RegistryMetadataschemasResponse> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadataschemasSuccessResponse) => response.metadataschemasResponse)
-    );
-
-    const metadataschemasObs: Observable<MetadataSchema[]> = rmrObs.pipe(
-      map((rmr: RegistryMetadataschemasResponse) => rmr.metadataschemas)
-    );
-
-    const pageInfoObs: Observable<PageInfo> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadataschemasSuccessResponse) => response.pageInfo)
-    );
-
-    const payloadObs = observableCombineLatest(metadataschemasObs, pageInfoObs).pipe(
-      map(([metadataschemas, pageInfo]) => {
-        return new PaginatedList(pageInfo, metadataschemas);
-      })
-    );
-
-    return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
+  public getMetadataSchemas(options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<MetadataSchema>>): Observable<RemoteData<PaginatedList<MetadataSchema>>> {
+    return this.metadataSchemaService.findAll(options, ...linksToFollow);
   }
 
   /**
    * Retrieves a metadata schema by its name
    * @param schemaName The name of the schema to find
+   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  public getMetadataSchemaByName(schemaName: string): Observable<RemoteData<MetadataSchema>> {
-    // Temporary pagination to get ALL metadataschemas until there's a rest api endpoint for fetching a specific schema
-    const pagination: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-      id: 'all-metadatafields-pagination',
-      pageSize: 10000
+  public getMetadataSchemaByName(schemaName: string, ...linksToFollow: Array<FollowLinkConfig<MetadataSchema>>): Observable<RemoteData<MetadataSchema>> {
+    // Temporary options to get ALL metadataschemas until there's a rest api endpoint for fetching a specific schema
+    const options: FindListOptions = Object.assign(new FindListOptions(), {
+      elementsPerPage: 10000
     });
-    const requestObs = this.getMetadataSchemasRequestObs(pagination);
-
-    const requestEntryObs = requestObs.pipe(
-      flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
+    return this.getMetadataSchemas(options).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((schemas: PaginatedList<MetadataSchema>) => schemas.page),
+      isNotEmptyOperator(),
+      map((schemas: MetadataSchema[]) => schemas.filter((schema) => schema.prefix === schemaName)[0]),
+      flatMap((schema: MetadataSchema) => this.metadataSchemaService.findById(`${schema.id}`, ...linksToFollow))
     );
-
-    const rmrObs: Observable<RegistryMetadataschemasResponse> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadataschemasSuccessResponse) => response.metadataschemasResponse)
-    );
-
-    const metadataschemaObs: Observable<MetadataSchema> = rmrObs.pipe(
-      map((rmr: RegistryMetadataschemasResponse) => rmr.metadataschemas),
-      map((metadataSchemas: MetadataSchema[]) => metadataSchemas.filter((value) => value.prefix === schemaName)[0])
-    );
-
-    return this.rdb.toRemoteDataObservable(requestEntryObs, metadataschemaObs);
   }
 
   /**
    * retrieves all metadata fields that belong to a certain metadata schema
    * @param schema The schema to filter by
-   * @param pagination The pagination info used to retrieve the fields
+   * @param options The options info used to retrieve the fields
+   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
-  public getMetadataFieldsBySchema(schema: MetadataSchema, pagination: PaginationComponentOptions): Observable<RemoteData<PaginatedList<MetadataField>>> {
-    const requestObs = this.getMetadataFieldsBySchemaRequestObs(pagination, schema);
-
-    const requestEntryObs = requestObs.pipe(
-      flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-
-    const rmrObs: Observable<RegistryMetadatafieldsResponse> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadatafieldsSuccessResponse) => response.metadatafieldsResponse)
-    );
-
-    const metadatafieldsObs: Observable<MetadataField[]> = rmrObs.pipe(
-      map((rmr: RegistryMetadatafieldsResponse) => rmr.metadatafields)
-    );
-
-    const pageInfoObs: Observable<PageInfo> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-
-      map((response: RegistryMetadatafieldsSuccessResponse) => response.pageInfo)
-    );
-
-    const payloadObs = observableCombineLatest(metadatafieldsObs, pageInfoObs).pipe(
-      map(([metadatafields, pageInfo]) => {
-        return new PaginatedList(pageInfo, metadatafields);
-      })
-    );
-
-    return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
+  public getMetadataFieldsBySchema(schema: MetadataSchema, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<MetadataField>>): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    return this.metadataFieldService.findBySchema(schema, options, ...linksToFollow);
   }
 
   /**
    * Retrieve all existing metadata fields as a paginated list
-   * @param pagination Pagination options to determine which page of metadata fields should be requested
-   * When no pagination is provided, all metadata fields are requested in one large page
+   * @param options Options to determine which page of metadata fields should be requested
+   * When no options are provided, all metadata fields are requested in one large page
+   * @param linksToFollow List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    * @returns an observable that emits a remote data object with a page of metadata fields
    */
-  public getAllMetadataFields(pagination?: PaginationComponentOptions): Observable<RemoteData<PaginatedList<MetadataField>>> {
-    if (hasNoValue(pagination)) {
-      pagination = {currentPage: 1, pageSize: 10000} as any;
+  public getAllMetadataFields(options?: FindListOptions, ...linksToFollow: Array<FollowLinkConfig<MetadataField>>): Observable<RemoteData<PaginatedList<MetadataField>>> {
+    if (hasNoValue(options)) {
+      options = {currentPage: 1, elementsPerPage: 10000} as any;
     }
-    const requestObs = this.getMetadataFieldsRequestObs(pagination);
-
-    const requestEntryObs = requestObs.pipe(
-      flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
-    );
-
-    const rmrObs: Observable<RegistryMetadatafieldsResponse> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-      map((response: RegistryMetadatafieldsSuccessResponse) => response.metadatafieldsResponse)
-    );
-
-    const metadatafieldsObs: Observable<MetadataField[]> = rmrObs.pipe(
-      map((rmr: RegistryMetadatafieldsResponse) => rmr.metadatafields),
-      /* Make sure to explicitly cast this into a MetadataField object, on first page loads this object comes from the object cache created by the server and its prototype is unknown */
-      map((metadataFields: MetadataField[]) => metadataFields.map((metadataField: MetadataField) => Object.assign(new MetadataField(), metadataField)))
-    );
-
-    const pageInfoObs: Observable<PageInfo> = requestEntryObs.pipe(
-      getResponseFromEntry(),
-
-      map((response: RegistryMetadatafieldsSuccessResponse) => response.pageInfo)
-    );
-
-    const payloadObs = observableCombineLatest(metadatafieldsObs, pageInfoObs).pipe(
-      map(([metadatafields, pageInfo]) => {
-        return new PaginatedList(pageInfo, metadatafields);
-      })
-    );
-
-    return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
-  }
-
-  public getMetadataSchemasRequestObs(pagination: PaginationComponentOptions): Observable<RestRequest> {
-    return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
-      map((url: string) => {
-        const args: string[] = [];
-        args.push(`size=${pagination.pageSize}`);
-        args.push(`page=${pagination.currentPage - 1}`);
-        if (isNotEmpty(args)) {
-          url = new URLCombiner(url, `?${args.join('&')}`).toString();
-        }
-        const request = new GetRequest(this.requestService.generateRequestId(), url);
-        return Object.assign(request, {
-          getResponseParser(): GenericConstructor<ResponseParsingService> {
-            return RegistryMetadataschemasResponseParsingService;
-          }
-        });
-      }),
-      tap((request: RestRequest) => this.requestService.configure(request)),
-    );
-  }
-
-  private getMetadataFieldsBySchemaRequestObs(pagination: PaginationComponentOptions, schema: MetadataSchema): Observable<RestRequest> {
-    return this.halService.getEndpoint(this.metadataFieldsPath + '/search/bySchema').pipe(
-      // return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
-      map((url: string) => {
-        const args: string[] = [];
-        args.push(`schema=${schema.prefix}`);
-        args.push(`size=${pagination.pageSize}`);
-        args.push(`page=${pagination.currentPage - 1}`);
-        if (isNotEmpty(args)) {
-          url = new URLCombiner(url, `?${args.join('&')}`).toString();
-        }
-        const request = new GetRequest(this.requestService.generateRequestId(), url);
-        return Object.assign(request, {
-          getResponseParser(): GenericConstructor<ResponseParsingService> {
-            return RegistryMetadatafieldsResponseParsingService;
-          }
-        });
-      }),
-      tap((request: RestRequest) => this.requestService.configure(request)),
-    );
-  }
-
-  private getMetadataFieldsRequestObs(pagination: PaginationComponentOptions): Observable<RestRequest> {
-    return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
-      map((url: string) => {
-        const args: string[] = [];
-        args.push(`size=${pagination.pageSize}`);
-        args.push(`page=${pagination.currentPage - 1}`);
-        if (isNotEmpty(args)) {
-          url = new URLCombiner(url, `?${args.join('&')}`).toString();
-        }
-        const request = new GetRequest(this.requestService.generateRequestId(), url);
-        return Object.assign(request, {
-          getResponseParser(): GenericConstructor<ResponseParsingService> {
-            return RegistryMetadatafieldsResponseParsingService;
-          }
-        });
-      }),
-      tap((request: RestRequest) => this.requestService.configure(request)),
-    );
+    return this.metadataFieldService.findAll(options, ...linksToFollow);
   }
 
   public editMetadataSchema(schema: MetadataSchema) {
@@ -386,59 +209,17 @@ export class RegistryService {
    * Create or Update a MetadataSchema
    *  If the MetadataSchema contains an id, it is assumed the schema already exists and is updated instead
    *  Since creating or updating is nearly identical, the only real difference is the request (and slight difference in endpoint):
-   *  - On creation, a CreateMetadataSchemaRequest is used
-   *  - On update, a UpdateMetadataSchemaRequest is used
+   *  - On creation, a CreateRequest is used
+   *  - On update, a PutRequest is used
    * @param schema    The MetadataSchema to create or update
    */
   public createOrUpdateMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
     const isUpdate = hasValue(schema.id);
-    const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.halService.getEndpoint(this.metadataSchemasPath).pipe(
-      isNotEmptyOperator(),
-      map((endpoint: string) => (isUpdate ? `${endpoint}/${schema.id}` : endpoint)),
-      distinctUntilChanged()
-    );
-
-    const serializedSchema = new DSpaceSerializer(getClassForType(MetadataSchema.type)).serialize(schema);
-
-    const request$ = endpoint$.pipe(
-      take(1),
-      map((endpoint: string) => {
-        if (isUpdate) {
-          const options: HttpOptions = Object.create({});
-          let headers = new HttpHeaders();
-          headers = headers.append('Content-Type', 'application/json');
-          options.headers = headers;
-          return new UpdateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema), options);
-        } else {
-          return new CreateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema));
-        }
-      })
-    );
-
-    // Execute the post/put request
-    request$.pipe(
-      configureRequest(this.requestService)
-    ).subscribe();
-
-    // Return created/updated schema
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      map((response: RestResponse) => {
-        if (!response.isSuccessful) {
-          if (hasValue((response as any).errorMessage)) {
-            this.notificationsService.error('Server Error:', (response as any).errorMessage, new NotificationOptions(-1));
-          }
-        } else {
-          this.showNotifications(true, isUpdate, false, {prefix: schema.prefix});
-          return response;
-        }
-      }),
-      isNotEmptyOperator(),
-      map((response: MetadataschemaSuccessResponse) => {
-        if (isNotEmpty(response.metadataschema)) {
-          return response.metadataschema;
-        }
+    return this.metadataSchemaService.createOrUpdateMetadataSchema(schema).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      hasValueOperator(),
+      tap(() => {
+        this.showNotifications(true, isUpdate, false, {prefix: schema.prefix});
       })
     );
   }
@@ -448,74 +229,32 @@ export class RegistryService {
    * @param id The id of the metadata schema to delete
    */
   public deleteMetadataSchema(id: number): Observable<RestResponse> {
-    return this.delete(this.metadataSchemasPath, id);
+    return this.metadataSchemaService.deleteAndReturnResponse(`${id}`);
   }
 
   /**
    * Method that clears a cached metadata schema request and returns its REST url
    */
   public clearMetadataSchemaRequests(): Observable<string> {
-    return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
-      tap((href: string) => this.requestService.removeByHrefSubstring(href))
-    );
+    return this.metadataSchemaService.clearRequests();
   }
 
   /**
    * Create or Update a MetadataField
    *  If the MetadataField contains an id, it is assumed the field already exists and is updated instead
    *  Since creating or updating is nearly identical, the only real difference is the request (and slight difference in endpoint):
-   *  - On creation, a CreateMetadataFieldRequest is used
-   *  - On update, a UpdateMetadataFieldRequest is used
+   *  - On creation, a CreateRequest is used
+   *  - On update, a PutRequest is used
    * @param field    The MetadataField to create or update
    */
   public createOrUpdateMetadataField(field: MetadataField): Observable<MetadataField> {
     const isUpdate = hasValue(field.id);
-    const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.halService.getEndpoint(this.metadataFieldsPath).pipe(
-      isNotEmptyOperator(),
-      map((endpoint: string) => (isUpdate ? `${endpoint}/${field.id}` : `${endpoint}?schemaId=${field.schema.id}`)),
-      distinctUntilChanged()
-    );
-
-    const request$ = endpoint$.pipe(
-      take(1),
-      map((endpoint: string) => {
-        if (isUpdate) {
-          const options: HttpOptions = Object.create({});
-          let headers = new HttpHeaders();
-          headers = headers.append('Content-Type', 'application/json');
-          options.headers = headers;
-          return new UpdateMetadataFieldRequest(requestId, endpoint, JSON.stringify(field), options);
-        } else {
-          return new CreateMetadataFieldRequest(requestId, endpoint, JSON.stringify(field));
-        }
-      })
-    );
-
-    // Execute the post/put request
-    request$.pipe(
-      configureRequest(this.requestService)
-    ).subscribe();
-
-    // Return created/updated field
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry(),
-      map((response: RestResponse) => {
-        if (!response.isSuccessful) {
-          if (hasValue((response as any).errorMessage)) {
-            this.notificationsService.error('Server Error:', (response as any).errorMessage, new NotificationOptions(-1));
-          }
-        } else {
-          const fieldString = `${field.schema.prefix}.${field.element}${field.qualifier ? `.${field.qualifier}` : ''}`;
-          this.showNotifications(true, isUpdate, true, {field: fieldString});
-          return response;
-        }
-      }),
-      isNotEmptyOperator(),
-      map((response: MetadatafieldSuccessResponse) => {
-        if (isNotEmpty(response.metadatafield)) {
-          return response.metadatafield;
-        }
+    return this.metadataFieldService.createOrUpdateMetadataField(field).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      hasValueOperator(),
+      tap(() => {
+        const fieldString = `${field.schema.prefix}.${field.element}${field.qualifier ? `.${field.qualifier}` : ''}`;
+        this.showNotifications(true, isUpdate, true, {field: fieldString});
       })
     );
   }
@@ -525,38 +264,13 @@ export class RegistryService {
    * @param id The id of the metadata field to delete
    */
   public deleteMetadataField(id: number): Observable<RestResponse> {
-    return this.delete(this.metadataFieldsPath, id);
+    return this.metadataFieldService.deleteAndReturnResponse(`${id}`);
   }
   /**
    * Method that clears a cached metadata field request and returns its REST url
    */
   public clearMetadataFieldRequests(): Observable<string> {
-    return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
-      tap((href: string) => this.requestService.removeByHrefSubstring(href))
-    );
-  }
-
-  private delete(path: string, id: number): Observable<RestResponse> {
-    const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.halService.getEndpoint(path).pipe(
-      isNotEmptyOperator(),
-      map((endpoint: string) => `${endpoint}/${id}`),
-      distinctUntilChanged()
-    );
-
-    const request$ = endpoint$.pipe(
-      take(1),
-      map((endpoint: string) => new DeleteRequest(requestId, endpoint))
-    );
-
-    // Execute the delete request
-    request$.pipe(
-      configureRequest(this.requestService)
-    ).subscribe();
-
-    return this.requestService.getByUUID(requestId).pipe(
-      getResponseFromEntry()
-    );
+    return this.metadataFieldService.clearRequests();
   }
 
   private showNotifications(success: boolean, edited: boolean, isField: boolean, options: any) {
diff --git a/src/app/core/shared/file.service.ts b/src/app/core/shared/file.service.ts
index 7e89a4e5dd..ca0a409b2d 100644
--- a/src/app/core/shared/file.service.ts
+++ b/src/app/core/shared/file.service.ts
@@ -1,10 +1,10 @@
-import { Injectable } from '@angular/core';
-import { HttpHeaders } from '@angular/common/http';
-
-import { DSpaceRESTv2Service, HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { saveAs } from 'file-saver';
+import { Inject, Injectable } from '@angular/core';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { AuthService } from '../auth/auth.service';
+import { take } from 'rxjs/operators';
+import { NativeWindowRef, NativeWindowService } from '../services/window.service';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * Provides utility methods to save files on the client-side.
@@ -12,22 +12,20 @@ import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.
 @Injectable()
 export class FileService {
   constructor(
-    private restService: DSpaceRESTv2Service
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+    private authService: AuthService
   ) { }
 
   /**
-   * Makes a HTTP Get request to download a file
+   * Combines an URL with a short-lived token and sets the current URL to the newly created one
    *
    * @param url
    *    file url
    */
   downloadFile(url: string) {
-    const headers = new HttpHeaders();
-    const options: HttpOptions = Object.create({headers, responseType: 'blob'});
-    return this.restService.request(RestRequestMethod.GET, url, null, options)
-      .subscribe((data) => {
-        saveAs(data.payload as Blob, this.getFileNameFromResponseContentDisposition(data));
-      });
+    this.authService.getShortlivedToken().pipe(take(1)).subscribe((token) => {
+      this._window.nativeWindow.location.href = hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url;
+    });
   }
 
   /**
diff --git a/src/app/core/shared/registration.model.ts b/src/app/core/shared/registration.model.ts
new file mode 100644
index 0000000000..1943be2db5
--- /dev/null
+++ b/src/app/core/shared/registration.model.ts
@@ -0,0 +1,26 @@
+/**
+ * Model representing a registration
+ */
+export class Registration {
+
+  /**
+   * The object type
+   */
+  type: string;
+
+  /**
+   * The email linked to the registration
+   */
+  email: string;
+
+  /**
+   * The user linked to the registration
+   */
+  user: string;
+
+  /**
+   * The token linked to the registration
+   */
+  token: string;
+
+}
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.html b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
new file mode 100644
index 0000000000..263f142c2e
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.html
@@ -0,0 +1,3 @@
+<ds-register-email-form
+    [MESSAGE_PREFIX]="'forgot-email.form'">
+</ds-register-email-form>
\ No newline at end of file
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
new file mode 100644
index 0000000000..d466cbf11b
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
@@ -0,0 +1,29 @@
+import { ForgotEmailComponent } from './forgot-email.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { ReactiveFormsModule } from '@angular/forms';
+
+describe('ForgotEmailComponent', () => {
+  let comp: ForgotEmailComponent;
+  let fixture: ComponentFixture<ForgotEmailComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [ForgotEmailComponent],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ForgotEmailComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+
+  it('should be defined', () => {
+    expect(comp).toBeDefined();
+  });
+});
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
new file mode 100644
index 0000000000..5e18aff113
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-forgot-email',
+  templateUrl: './forgot-email.component.html'
+})
+/**
+ * Component responsible the forgot password email step
+ */
+export class ForgotEmailComponent {
+
+}
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
new file mode 100644
index 0000000000..06a1909f00
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -0,0 +1,36 @@
+<div class="container">
+    <h3 class="mb-4">{{'forgot-password.form.head' | translate}}</h3>
+    <div class="card mb-4">
+        <div class="card-header">{{'forgot-password.form.identification.header' | translate}}</div>
+        <div class="card-body">
+            <div class="row">
+                <div class="col-12">
+                    <label class="font-weight-bold"
+                           for="email">{{'forgot-password.form.identification.email' | translate}}</label>
+                    <span id="email">{{(registration$ |async).email}}</span></div>
+            </div>
+        </div>
+    </div>
+
+    <div class="card mb-4">
+        <div class="card-header">{{'forgot-password.form.card.security' | translate}}</div>
+        <div class="card-body">
+
+            <ds-profile-page-security-form
+                    [passwordCanBeEmpty]="false"
+                    [FORM_PREFIX]="'forgot-password.form.'"
+                    (isInvalid)="setInValid($event)"
+                    (passwordValue)="setPasswordValue($event)"
+            ></ds-profile-page-security-form>
+        </div>
+    </div>
+
+    <div class="row">
+        <div class="col-12">
+            <button
+                    [disabled]="isInValid"
+                    class="btn btn-default btn-primary"
+                    (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
new file mode 100644
index 0000000000..7c23a2af94
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.spec.ts
@@ -0,0 +1,117 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { of as observableOf } from 'rxjs';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RestResponse } from '../../core/cache/response.models';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CoreState } from '../../core/core.reducers';
+import { Registration } from '../../core/shared/registration.model';
+import { ForgotPasswordFormComponent } from './forgot-password-form.component';
+import { By } from '@angular/platform-browser';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+
+describe('ForgotPasswordFormComponent', () => {
+  let comp: ForgotPasswordFormComponent;
+  let fixture: ComponentFixture<ForgotPasswordFormComponent>;
+
+  let router;
+  let route;
+  let ePersonDataService: EPersonDataService;
+  let notificationsService;
+  let store: Store<CoreState>;
+
+  const registration = Object.assign(new Registration(), {
+    email: 'test@email.org',
+    user: 'test-uuid',
+    token: 'test-token'
+  });
+
+  beforeEach(async(() => {
+
+    route = {data: observableOf({registration: registration})};
+    router = new RouterStub();
+    notificationsService = new NotificationsServiceStub();
+
+    ePersonDataService = jasmine.createSpyObj('ePersonDataService', {
+      patchPasswordWithToken: observableOf(new RestResponse(true, 200, 'Success'))
+    });
+
+    store = jasmine.createSpyObj('store', {
+      dispatch: {},
+    });
+
+    TestBed.configureTestingModule({
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [ForgotPasswordFormComponent],
+      providers: [
+        {provide: Router, useValue: router},
+        {provide: ActivatedRoute, useValue: route},
+        {provide: Store, useValue: store},
+        {provide: EPersonDataService, useValue: ePersonDataService},
+        {provide: FormBuilder, useValue: new FormBuilder()},
+        {provide: NotificationsService, useValue: notificationsService},
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ForgotPasswordFormComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+
+  describe('init', () => {
+    it('should initialise mail address', () => {
+      const elem = fixture.debugElement.queryAll(By.css('span#email'))[0].nativeElement;
+      expect(elem.innerHTML).toContain('test@email.org');
+    });
+  });
+
+  describe('submit', () => {
+
+    it('should submit a patch request for the user uuid and log in on success', () => {
+      comp.password = 'password';
+      comp.isInValid = false;
+
+      comp.submit();
+
+      expect(ePersonDataService.patchPasswordWithToken).toHaveBeenCalledWith('test-uuid', 'test-token', 'password');
+      expect(store.dispatch).toHaveBeenCalledWith(new AuthenticateAction('test@email.org', 'password'));
+      expect(router.navigate).toHaveBeenCalledWith(['/home']);
+      expect(notificationsService.success).toHaveBeenCalled();
+    });
+
+    it('should submit a patch request for the user uuid and stay on page on error', () => {
+
+      (ePersonDataService.patchPasswordWithToken as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 500, 'Error')));
+
+      comp.password = 'password';
+      comp.isInValid = false;
+
+      comp.submit();
+
+      expect(ePersonDataService.patchPasswordWithToken).toHaveBeenCalledWith('test-uuid', 'test-token', 'password');
+      expect(store.dispatch).not.toHaveBeenCalled();
+      expect(router.navigate).not.toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+    });
+    it('should submit a patch request for the user uuid when the form is invalid', () => {
+
+      comp.password = 'password';
+      comp.isInValid = true;
+
+      comp.submit();
+
+      expect(ePersonDataService.patchPasswordWithToken).not.toHaveBeenCalled();
+    });
+  })
+});
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
new file mode 100644
index 0000000000..1ad66a0b04
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -0,0 +1,87 @@
+import { Component } from '@angular/core';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { ErrorResponse, RestResponse } from '../../core/cache/response.models';
+import { TranslateService } from '@ngx-translate/core';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { Observable } from 'rxjs';
+import { Registration } from '../../core/shared/registration.model';
+import { map } from 'rxjs/operators';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core/core.reducers';
+
+@Component({
+  selector: 'ds-forgot-password-form',
+  templateUrl: './forgot-password-form.component.html'
+})
+/**
+ * Component for a user to enter a new password for a forgot token.
+ */
+export class ForgotPasswordFormComponent {
+
+  registration$: Observable<Registration>;
+
+  token: string;
+  email: string;
+  user: string;
+
+  isInValid = true;
+  password: string;
+
+  /**
+   * Prefix for the notification messages of this component
+   */
+  NOTIFICATIONS_PREFIX = 'forgot-password.form.notification';
+
+  constructor(private ePersonDataService: EPersonDataService,
+              private translateService: TranslateService,
+              private notificationsService: NotificationsService,
+              private store: Store<CoreState>,
+              private router: Router,
+              private route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.registration$ = this.route.data.pipe(
+      map((data) => data.registration as Registration),
+    );
+    this.registration$.subscribe((registration: Registration) => {
+      this.email = registration.email;
+      this.token = registration.token;
+      this.user = registration.user;
+    });
+  }
+
+  setInValid($event: boolean) {
+    this.isInValid = $event;
+  }
+
+  setPasswordValue($event: string) {
+    this.password = $event;
+  }
+
+  /**
+   * Submits the password to the eperson service to be updated.
+   * The submission will not be made when the form is not valid.
+   */
+  submit() {
+    if (!this.isInValid) {
+      this.ePersonDataService.patchPasswordWithToken(this.user, this.token, this.password).subscribe((response: RestResponse) => {
+        if (response.isSuccessful) {
+          this.notificationsService.success(
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.title'),
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.content')
+          );
+          this.store.dispatch(new AuthenticateAction(this.email, this.password));
+          this.router.navigate(['/home']);
+        } else {
+          this.notificationsService.error(
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.error.title'), (response as ErrorResponse).errorMessage
+          );
+        }
+      });
+    }
+  }
+}
diff --git a/src/app/forgot-password/forgot-password-routing.module.ts b/src/app/forgot-password/forgot-password-routing.module.ts
new file mode 100644
index 0000000000..702de03a9d
--- /dev/null
+++ b/src/app/forgot-password/forgot-password-routing.module.ts
@@ -0,0 +1,32 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { ItemPageResolver } from '../+item-page/item-page.resolver';
+import { RegistrationResolver } from '../register-email-form/registration.resolver';
+import { ForgotPasswordFormComponent } from './forgot-password-form/forgot-password-form.component';
+import { ForgotEmailComponent } from './forgot-password-email/forgot-email.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        component: ForgotEmailComponent,
+        data: {title: 'forgot-password.title'},
+      },
+      {
+        path: ':token',
+        component: ForgotPasswordFormComponent,
+        resolve: {registration: RegistrationResolver}
+      }
+    ])
+  ],
+  providers: [
+    RegistrationResolver,
+    ItemPageResolver
+  ]
+})
+/**
+ * This module defines the routing to the components related to the forgot password components.
+ */
+export class ForgotPasswordRoutingModule {
+}
diff --git a/src/app/forgot-password/forgot-password.module.ts b/src/app/forgot-password/forgot-password.module.ts
new file mode 100644
index 0000000000..5f01f0fcd2
--- /dev/null
+++ b/src/app/forgot-password/forgot-password.module.ts
@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared/shared.module';
+import { ForgotEmailComponent } from './forgot-password-email/forgot-email.component';
+import { ForgotPasswordRoutingModule } from './forgot-password-routing.module';
+import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
+import { ForgotPasswordFormComponent } from './forgot-password-form/forgot-password-form.component';
+import { ProfilePageModule } from '../profile-page/profile-page.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    ForgotPasswordRoutingModule,
+    RegisterEmailFormModule,
+    ProfilePageModule,
+  ],
+  declarations: [
+    ForgotEmailComponent,
+    ForgotPasswordFormComponent
+  ],
+  providers: [],
+  entryComponents: []
+})
+
+/**
+ * Module related to the Forgot Password components
+ */
+export class ForgotPasswordModule {
+
+}
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.html b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
new file mode 100644
index 0000000000..ce26008c28
--- /dev/null
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.html
@@ -0,0 +1,2 @@
+<h4 class="mt-4">{{title | translate}}</h4>
+<ng-content></ng-content>
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
new file mode 100644
index 0000000000..487adb2ac0
--- /dev/null
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.spec.ts
@@ -0,0 +1,38 @@
+import { ProcessDetailFieldComponent } from './process-detail-field.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+
+describe('ProcessDetailFieldComponent', () => {
+  let component: ProcessDetailFieldComponent;
+  let fixture: ComponentFixture<ProcessDetailFieldComponent>;
+
+  let title;
+
+  beforeEach(async(() => {
+    title = 'fake.title.message';
+
+    TestBed.configureTestingModule({
+      declarations: [ProcessDetailFieldComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessDetailFieldComponent);
+    component = fixture.componentInstance;
+    component.title = title;
+    fixture.detectChanges();
+  });
+
+  it('should display the given title', () => {
+    const header = fixture.debugElement.query(By.css('h4')).nativeElement;
+    expect(header.textContent).toContain(title);
+  });
+});
diff --git a/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts b/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
new file mode 100644
index 0000000000..f8015b6788
--- /dev/null
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
@@ -0,0 +1,15 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+  selector: 'ds-process-detail-field',
+  templateUrl: './process-detail-field.component.html',
+})
+/**
+ * A component displaying a single detail about a DSpace Process
+ */
+export class ProcessDetailFieldComponent {
+  /**
+   * I18n message for the header
+   */
+  @Input() title: string;
+}
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
new file mode 100644
index 0000000000..9cb1f1e6af
--- /dev/null
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -0,0 +1,42 @@
+<div class="container" *ngVar="(processRD$ | async)?.payload as process">
+    <div class="d-flex">
+        <h2 class="flex-grow-1">{{'process.detail.title' | translate:{id: process?.processId, name: process?.scriptName} }}</h2>
+        <div>
+            <a class="btn btn-light" [routerLink]="'/processes/new'" [queryParams]="{id: process?.processId}">{{'process.detail.create' | translate}}</a>
+        </div>
+    </div>
+    <ds-process-detail-field id="process-name" [title]="'process.detail.script'">
+        <div>{{ process?.scriptName }}</div>
+    </ds-process-detail-field>
+
+    <ds-process-detail-field *ngIf="process?.parameters && process?.parameters?.length > 0" id="process-arguments" [title]="'process.detail.arguments'">
+        <div *ngFor="let argument of process?.parameters">{{ argument?.name }} {{ argument?.value }}</div>
+    </ds-process-detail-field>
+
+    <div *ngVar="(filesRD$ | async)?.payload?.page as files">
+        <ds-process-detail-field *ngIf="files && files?.length > 0" id="process-files" [title]="'process.detail.output-files'">
+          <ds-file-download-link *ngFor="let file of files; let last=last;" [href]="file?._links?.content?.href" [download]="getFileName(file)">
+            <span>{{getFileName(file)}}</span>
+            <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+          </ds-file-download-link>
+        </ds-process-detail-field>
+    </div>
+
+    <ds-process-detail-field *ngIf="process && process.startTime" id="process-start-time" [title]="'process.detail.start-time' | translate">
+        <div>{{ process.startTime }}</div>
+    </ds-process-detail-field>
+
+    <ds-process-detail-field *ngIf="process && process.endTime" id="process-end-time" [title]="'process.detail.end-time' | translate">
+        <div>{{ process.endTime }}</div>
+    </ds-process-detail-field>
+
+    <ds-process-detail-field *ngIf="process && process.processStatus" id="process-status" [title]="'process.detail.status' | translate">
+        <div>{{ process.processStatus }}</div>
+    </ds-process-detail-field>
+
+    <!--<ds-process-detail-field id="process-output" [title]="'process.detail.output'">-->
+    <!--<pre class="font-weight-bold text-secondary bg-light p-3">{{'process.detail.output.alert' | translate}}</pre>-->
+    <!--</ds-process-detail-field>-->
+
+    <a class="btn btn-light mt-3" [routerLink]="'/processes'">{{'process.detail.back' | translate}}</a>
+</div>
diff --git a/src/app/process-page/detail/process-detail.component.spec.ts b/src/app/process-page/detail/process-detail.component.spec.ts
new file mode 100644
index 0000000000..dff481fdc6
--- /dev/null
+++ b/src/app/process-page/detail/process-detail.component.spec.ts
@@ -0,0 +1,107 @@
+import { ProcessDetailComponent } from './process-detail.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ProcessDetailFieldComponent } from './process-detail-field/process-detail-field.component';
+import { Process } from '../processes/process.model';
+import { ActivatedRoute } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { By } from '@angular/platform-browser';
+import { FileSizePipe } from '../../shared/utils/file-size-pipe';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+
+describe('ProcessDetailComponent', () => {
+  let component: ProcessDetailComponent;
+  let fixture: ComponentFixture<ProcessDetailComponent>;
+
+  let processService: ProcessDataService;
+  let nameService: DSONameService;
+
+  let process: Process;
+  let fileName: string;
+  let files: Bitstream[];
+
+  function init() {
+    process = Object.assign(new Process(), {
+      processId: 1,
+      scriptName: 'script-name',
+      parameters: [
+        {
+          name: '-f',
+          value: 'file.xml'
+        },
+        {
+          name: '-i',
+          value: 'identifier'
+        }
+      ]
+    });
+    fileName = 'fake-file-name';
+    files = [
+      Object.assign(new Bitstream(), {
+        sizeBytes: 10000,
+        metadata: {
+          'dc.title': [
+            {
+              value: fileName,
+              language: null
+            }
+          ]
+        },
+        _links: {
+          content: { href: 'file-selflink' }
+        }
+      })
+    ];
+    processService = jasmine.createSpyObj('processService', {
+      getFiles: createSuccessfulRemoteDataObject$(createPaginatedList(files))
+    });
+    nameService = jasmine.createSpyObj('nameService', {
+      getName: fileName
+    });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [ProcessDetailComponent, ProcessDetailFieldComponent, VarDirective, FileSizePipe],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: ActivatedRoute, useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) } },
+        { provide: ProcessDataService, useValue: processService },
+        { provide: DSONameService, useValue: nameService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should display the script\'s name', () => {
+    const name = fixture.debugElement.query(By.css('#process-name')).nativeElement;
+    expect(name.textContent).toContain(process.scriptName);
+  });
+
+  it('should display the process\'s parameters', () => {
+    const args = fixture.debugElement.query(By.css('#process-arguments')).nativeElement;
+    process.parameters.forEach((param) => {
+      expect(args.textContent).toContain(`${param.name} ${param.value}`)
+    });
+  });
+
+  it('should display the process\'s output files', () => {
+    const processFiles = fixture.debugElement.query(By.css('#process-files')).nativeElement;
+    expect(processFiles.textContent).toContain(fileName);
+  });
+
+});
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
new file mode 100644
index 0000000000..b0e2c7e378
--- /dev/null
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -0,0 +1,69 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { Process } from '../processes/process.model';
+import { map, switchMap } from 'rxjs/operators';
+import { getFirstSucceededRemoteDataPayload, redirectToPageNotFoundOn404 } from '../../core/shared/operators';
+import { AlertType } from '../../shared/alert/aletr-type';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+
+@Component({
+  selector: 'ds-process-detail',
+  templateUrl: './process-detail.component.html',
+})
+/**
+ * A component displaying detailed information about a DSpace Process
+ */
+export class ProcessDetailComponent implements OnInit {
+
+  /**
+   * The AlertType enumeration
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
+  /**
+   * The Process's Remote Data
+   */
+  processRD$: Observable<RemoteData<Process>>;
+
+  /**
+   * The Process's Output Files
+   */
+  filesRD$: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+  constructor(protected route: ActivatedRoute,
+              protected router: Router,
+              protected processService: ProcessDataService,
+              protected nameService: DSONameService) {
+  }
+
+  /**
+   * Initialize component properties
+   * Display a 404 if the process doesn't exist
+   */
+  ngOnInit(): void {
+    this.processRD$ = this.route.data.pipe(
+      map((data) => data.process as RemoteData<Process>),
+      redirectToPageNotFoundOn404(this.router)
+    );
+
+    this.filesRD$ = this.processRD$.pipe(
+      getFirstSucceededRemoteDataPayload(),
+      switchMap((process: Process) => this.processService.getFiles(process.processId))
+    );
+  }
+
+  /**
+   * Get the name of a bitstream
+   * @param bitstream
+   */
+  getFileName(bitstream: Bitstream) {
+    return this.nameService.getName(bitstream);
+  }
+
+}
diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
new file mode 100644
index 0000000000..ce6d62efec
--- /dev/null
+++ b/src/app/process-page/form/process-form.component.html
@@ -0,0 +1,25 @@
+<div class="container">
+    <div class="row">
+        <h2 class="col-12">
+            {{headerKey | translate}}
+        </h2>
+        <div class="col-12 col-md-6">
+            <form #form="ngForm" (ngSubmit)="submitForm(form)">
+                <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
+                <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
+                <button [routerLink]="['/processes']" class="btn btn-light float-left">{{ 'process.new.cancel' | translate }}</button>
+                <button type="submit" class="btn btn-light float-right">{{ 'process.new.submit' | translate }}</button>
+            </form>
+        </div>
+        <div class="col-12 col-md-6">
+            <ds-script-help [script]="selectedScript"></ds-script-help>
+        </div>
+    </div>
+
+    <div *ngIf="missingParameters.length > 0" class="mt-3 alert alert-danger validation-error">
+        {{'process.new.parameter.required.missing' | translate}}
+        <ul>
+            <li *ngFor="let missing of missingParameters">{{missing}}</li>
+        </ul>
+    </div>
+</div>
diff --git a/src/app/process-page/form/process-form.component.scss b/src/app/process-page/form/process-form.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/form/process-form.component.spec.ts b/src/app/process-page/form/process-form.component.spec.ts
new file mode 100644
index 0000000000..12326111da
--- /dev/null
+++ b/src/app/process-page/form/process-form.component.spec.ts
@@ -0,0 +1,86 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ProcessFormComponent } from './process-form.component';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { Script } from '../scripts/script.model';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of as observableOf } from 'rxjs';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { RequestService } from '../../core/data/request.service';
+import { Router } from '@angular/router';
+
+describe('ProcessFormComponent', () => {
+  let component: ProcessFormComponent;
+  let fixture: ComponentFixture<ProcessFormComponent>;
+  let scriptService;
+  let parameterValues;
+  let script;
+
+  function init() {
+    const param1 = new ScriptParameter();
+    const param2 = new ScriptParameter();
+    script = Object.assign(new Script(), { parameters: [param1, param2] });
+    parameterValues = [
+      Object.assign(new ProcessParameter(), { name: '-a', value: 'bla' }),
+      Object.assign(new ProcessParameter(), { name: '-b', value: '123' }),
+      Object.assign(new ProcessParameter(), { name: '-c', value: 'value' }),
+    ];
+    scriptService = jasmine.createSpyObj(
+      'scriptService',
+      {
+        invoke: observableOf({
+          response:
+            {
+              isSuccessful: true
+            }
+        })
+      }
+    )
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [ProcessFormComponent],
+      providers: [
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeBySubstring']) },
+        { provide: Router, useValue: {} },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessFormComponent);
+    component = fixture.componentInstance;
+    component.parameters = parameterValues;
+    component.selectedScript = script;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should call invoke on the scriptService on submit', () => {
+    component.submitForm({ controls: {} } as any);
+    expect(scriptService.invoke).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/process-page/form/process-form.component.ts b/src/app/process-page/form/process-form.component.ts
new file mode 100644
index 0000000000..ee7d7d85d2
--- /dev/null
+++ b/src/app/process-page/form/process-form.component.ts
@@ -0,0 +1,151 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { Script } from '../scripts/script.model';
+import { Process } from '../processes/process.model';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { RequestEntry } from '../../core/data/request.reducer';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { take } from 'rxjs/operators';
+import { RequestService } from '../../core/data/request.service';
+import { Router } from '@angular/router';
+
+/**
+ * Component to create a new script
+ */
+@Component({
+  selector: 'ds-process-form',
+  templateUrl: './process-form.component.html',
+  styleUrls: ['./process-form.component.scss'],
+})
+export class ProcessFormComponent implements OnInit {
+  /**
+   * The currently selected script
+   */
+  @Input() public selectedScript: Script = undefined;
+
+  /**
+   * The process to create
+   */
+  @Input() public process: Process = undefined;
+
+  /**
+   * The parameter values to use to start the process
+   */
+  @Input() public parameters: ProcessParameter[];
+
+  /**
+   * Optional files that are used as parameter values
+   */
+  public files: File[] = [];
+
+  /**
+   * Message key for the header of the form
+   */
+  @Input() public headerKey: string;
+
+  /**
+   * Contains the missing parameters on submission
+   */
+  public missingParameters = [];
+
+  constructor(
+    private scriptService: ScriptDataService,
+    private notificationsService: NotificationsService,
+    private translationService: TranslateService,
+    private requestService: RequestService,
+    private router: Router) {
+  }
+
+  ngOnInit(): void {
+    this.process = new Process();
+  }
+
+  /**
+   * Validates the form, sets the parameters to correct values and invokes the script with the correct parameters
+   * @param form
+   */
+  submitForm(form: NgForm) {
+    if (!this.validateForm(form) || this.isRequiredMissing()) {
+      return;
+    }
+
+    const stringParameters: ProcessParameter[] = this.parameters.map((parameter: ProcessParameter) => {
+        return {
+          name: parameter.name,
+          value: this.checkValue(parameter)
+        };
+      }
+    );
+    this.scriptService.invoke(this.selectedScript.id, stringParameters, this.files)
+      .pipe(take(1))
+      .subscribe((requestEntry: RequestEntry) => {
+        if (requestEntry.response.isSuccessful) {
+          const title = this.translationService.get('process.new.notification.success.title');
+          const content = this.translationService.get('process.new.notification.success.content');
+          this.notificationsService.success(title, content);
+          this.sendBack();
+        } else {
+          const title = this.translationService.get('process.new.notification.error.title');
+          const content = this.translationService.get('process.new.notification.error.content');
+          this.notificationsService.error(title, content);
+        }
+      })
+  }
+
+  /**
+   * Checks whether the parameter values are files
+   * Replaces file parameters by strings and stores the files in a separate list
+   * @param processParameter The parameter value to check
+   */
+  private checkValue(processParameter: ProcessParameter): string {
+    if (typeof processParameter.value === 'object') {
+      this.files = [...this.files, processParameter.value];
+      return processParameter.value.name;
+    }
+    return processParameter.value;
+  }
+
+  /**
+   * Validates the form
+   * Returns false if the form is invalid
+   * Returns true if the form is valid
+   * @param form The NgForm object to validate
+   */
+  private validateForm(form: NgForm) {
+    let valid = true;
+    Object.keys(form.controls).forEach((key) => {
+      if (form.controls[key].invalid) {
+        form.controls[key].markAsDirty();
+        valid = false;
+      }
+    });
+    return valid;
+  }
+
+  private isRequiredMissing() {
+    this.missingParameters = [];
+    const setParams: string[] = this.parameters
+      .map((param) => param.name);
+    const requiredParams: ScriptParameter[] = this.selectedScript.parameters.filter((param) => param.mandatory);
+    for (const rp of requiredParams) {
+      if (!setParams.includes(rp.name)) {
+        this.missingParameters.push(rp.name);
+      }
+    }
+    return this.missingParameters.length > 0;
+  }
+
+  private sendBack() {
+    this.requestService.removeByHrefSubstring('/processes');
+    /* should subscribe on the previous method to know the action is finished and then navigate,
+    will fix this when the removeByHrefSubstring changes are merged */
+    this.router.navigateByUrl('/processes');
+  }
+}
+
+export function controlContainerFactory(controlContainer?: ControlContainer) {
+  return controlContainer;
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
new file mode 100644
index 0000000000..4bf06bbade
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
@@ -0,0 +1,16 @@
+<div class="form-row mb-2 mx-0">
+    <select id="process-parameters"
+            class="form-control col"
+            name="parameter-{{index}}"
+            [(ngModel)]="selectedParameter"
+            #param="ngModel">
+        <option [ngValue]="undefined">Add a parameter...</option>
+        <option *ngFor="let param of parameters" [ngValue]="param.name">
+            {{param.nameLong || param.name}}
+        </option>
+    </select>
+    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col" [index]="index"></ds-parameter-value-input>
+    <button *ngIf="removable" class="btn btn-light col-1 remove-button" (click)="removeParameter.emit(parameterValue);"><span class="fas fa-trash"></span></button>
+    <span *ngIf="!removable" class="col-1"></span>
+</div>
+
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.scss b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
new file mode 100644
index 0000000000..97c0d7c3d0
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.spec.ts
@@ -0,0 +1,71 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ParameterSelectComponent } from './parameter-select.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import { By } from '@angular/platform-browser';
+
+describe('ParameterSelectComponent', () => {
+  let component: ParameterSelectComponent;
+  let fixture: ComponentFixture<ParameterSelectComponent>;
+  let scriptParams: ScriptParameter[];
+
+  function init() {
+    scriptParams = [
+      Object.assign(
+        new ScriptParameter(),
+        {
+          name: '-a',
+          type: ScriptParameterType.BOOLEAN
+        }
+      ),
+      Object.assign(
+        new ScriptParameter(),
+        {
+          name: '-f',
+          type: ScriptParameterType.FILE
+        }
+      ),
+    ]
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [FormsModule],
+      declarations: [ParameterSelectComponent],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ParameterSelectComponent);
+    component = fixture.componentInstance;
+
+    component.parameters = scriptParams;
+    component.removable = false;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should show the remove button when removable', () => {
+    component.removable = true;
+    fixture.detectChanges();
+
+    const button = fixture.debugElement.query(By.css('button.remove-button'));
+    expect(button).not.toBeNull();
+  });
+
+  it('should hide the remove button when not removable', () => {
+    component.removable = false;
+    fixture.detectChanges();
+
+    const button = fixture.debugElement.query(By.css('button.remove-button'));
+    expect(button).toBeNull();
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
new file mode 100644
index 0000000000..e016d3442f
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
@@ -0,0 +1,89 @@
+import { Component, EventEmitter, Input, Optional, Output } from '@angular/core';
+import { ProcessParameter } from '../../../processes/process-parameter.model';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../process-form.component';
+
+/**
+ * Component to select a single parameter for a process
+ */
+@Component({
+  selector: 'ds-parameter-select',
+  templateUrl: './parameter-select.component.html',
+  styleUrls: ['./parameter-select.component.scss'],
+  viewProviders: [{
+    provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]]
+  }]
+})
+export class ParameterSelectComponent {
+  @Input() index: number;
+
+  /**
+   * The current parameter value of the selected parameter
+   */
+  @Input() parameterValue: ProcessParameter = new ProcessParameter();
+
+  /**
+   * The available script parameters for the script
+   */
+  @Input() parameters: ScriptParameter[];
+
+  /**
+   * Whether or not this selected parameter can be removed from the list
+   */
+  @Input() removable: boolean;
+
+  /**
+   * Emits the parameter value when it's removed
+   */
+  @Output() removeParameter: EventEmitter<ProcessParameter> = new EventEmitter<ProcessParameter>();
+
+  /**
+   * Emits the updated parameter value when it changes
+   */
+  @Output() changeParameter: EventEmitter<ProcessParameter> = new EventEmitter<ProcessParameter>();
+
+  /**
+   * Returns the script parameter based on the currently selected name
+   */
+  get selectedScriptParameter(): ScriptParameter {
+    return this.parameters.find((parameter: ScriptParameter) => parameter.name === this.selectedParameter);
+  }
+
+  /**
+   * Return the currently selected parameter name
+   */
+  get selectedParameter(): string {
+    return this.parameterValue ? this.parameterValue.name : undefined;
+  }
+
+  /**
+   * Sets the currently selected parameter based on the provided parameter name
+   * Emits the new value from the changeParameter output
+   * @param value The parameter name to set
+   */
+  set selectedParameter(value: string) {
+    this.parameterValue.name = value;
+    this.selectedParameterValue = undefined;
+    this.changeParameter.emit(this.parameterValue);
+  }
+
+  /**
+   * Returns the currently selected parameter value
+   */
+  get selectedParameterValue(): any {
+    return this.parameterValue ? this.parameterValue.value : undefined;
+  }
+
+  /**
+   * Sets the currently selected value for the parameter
+   * Emits the new value from the changeParameter output
+   * @param value The parameter value to set
+   */
+  set selectedParameterValue(value: any) {
+    this.parameterValue.value = value;
+    this.changeParameter.emit(this.parameterValue);
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
new file mode 100644
index 0000000000..914b331413
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.html
@@ -0,0 +1 @@
+<input type="hidden" value="true" name="boolean-value-{{index}}" id="boolean-value-{{index}}"/>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
new file mode 100644
index 0000000000..15f09d98f0
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.spec.ts
@@ -0,0 +1,32 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { BooleanValueInputComponent } from './boolean-value-input.component';
+import { DebugElement } from '@angular/core';
+import { By } from '@angular/platform-browser';
+
+describe('BooleanValueInputComponent', () => {
+  let component: BooleanValueInputComponent;
+  let fixture: ComponentFixture<BooleanValueInputComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [BooleanValueInputComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BooleanValueInputComponent);
+    component = fixture.componentInstance;
+    spyOn(component.updateValue, 'emit');
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should emit true onInit', () => {
+    expect(component.updateValue.emit).toHaveBeenCalledWith(true);
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
new file mode 100644
index 0000000000..51b93cb6a1
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
@@ -0,0 +1,21 @@
+import { Component, OnInit, Optional } from '@angular/core';
+import { ValueInputComponent } from '../value-input.component';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../../process-form.component';
+
+/**
+ * Represents the value of a boolean parameter
+ */
+@Component({
+  selector: 'ds-boolean-value-input',
+  templateUrl: './boolean-value-input.component.html',
+  styleUrls: ['./boolean-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class BooleanValueInputComponent extends ValueInputComponent<boolean> implements OnInit {
+  ngOnInit() {
+    this.updateValue.emit(true)
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
new file mode 100644
index 0000000000..f367d3779f
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
@@ -0,0 +1,7 @@
+<input required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<div *ngIf="string.invalid && (string.dirty || string.touched)"
+     class="alert alert-danger validation-error">
+    <div *ngIf="string.errors.required">
+        {{'process.new.parameter.string.required' | translate}}
+    </div>
+</div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
new file mode 100644
index 0000000000..4f2212eff6
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
@@ -0,0 +1,70 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+
+import { DateValueInputComponent } from './date-value-input.component';
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+
+describe('DateValueInputComponent', () => {
+  let component: DateValueInputComponent;
+  let fixture: ComponentFixture<DateValueInputComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [DateValueInputComponent]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DateValueInputComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show a validation error if the input field was left untouched but left empty', () => {
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  });
+
+  it('should show a validation error if the input field was touched but left empty',  fakeAsync(() => {
+    component.value = '';
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeTruthy();
+  }));
+
+  it('should not show a validation error if the input field was touched but not left empty', fakeAsync(() => {
+    component.value = 'testValue';
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  }));
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
new file mode 100644
index 0000000000..7a4fbc0965
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
@@ -0,0 +1,36 @@
+import { Component, Input, Optional } from '@angular/core';
+import { ValueInputComponent } from '../value-input.component';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../../process-form.component';
+
+/**
+ * Represents the user inputted value of a date parameter
+ */
+@Component({
+  selector: 'ds-date-value-input',
+  templateUrl: './date-value-input.component.html',
+  styleUrls: ['./date-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class DateValueInputComponent extends ValueInputComponent<string> {
+  /**
+   * The current value of the date string
+   */
+  value: string;
+
+  /**
+   * Initial value of the field
+   */
+  @Input() initialValue;
+
+  ngOnInit() {
+    this.value = this.initialValue;
+  }
+
+  setValue(value) {
+    this.value = value;
+    this.updateValue.emit(value)
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
new file mode 100644
index 0000000000..cac3fbd82d
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
@@ -0,0 +1,13 @@
+<label for="file-upload-{{index}}" class="d-flex align-items-center m-0">
+    <span class="btn btn-light">
+        {{'process.new.parameter.file.upload-button' | translate}}
+    </span>
+    <span class="file-name ml-1">{{fileObject?.name}}</span>
+</label>
+<input requireFile #file="ngModel" type="file" name="file-upload-{{index}}" id="file-upload-{{index}}" class="form-control-file d-none" [ngModel]="fileObject" (ngModelChange)="setFile($event)"/>
+<div *ngIf="file.invalid && (file.dirty || file.touched)"
+     class="alert alert-danger validation-error">
+    <div *ngIf="file.errors.required">
+        {{'process.new.parameter.file.required' | translate}}
+    </div>
+</div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.scss
new file mode 100644
index 0000000000..29ea31add0
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.scss
@@ -0,0 +1,6 @@
+.file-name {
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
new file mode 100644
index 0000000000..434d5e4edb
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
@@ -0,0 +1,57 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+
+import { FormsModule, NgForm, ReactiveFormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { FileValueInputComponent } from './file-value-input.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { FileValueAccessorDirective } from '../../../../../shared/utils/file-value-accessor.directive';
+import { FileValidator } from '../../../../../shared/utils/require-file.validator';
+import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+
+describe('FileValueInputComponent', () => {
+  let component: FileValueInputComponent;
+  let fixture: ComponentFixture<FileValueInputComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [FileValueInputComponent, FileValueAccessorDirective, FileValidator],
+      schemas: [NO_ERRORS_SCHEMA]
+
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FileValueInputComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show a validation error if the input field was left untouched but left empty', () => {
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  });
+
+  it('should show a validation error if the input field was touched but left empty',  () => {
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeTruthy();
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
new file mode 100644
index 0000000000..796a5de58e
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
@@ -0,0 +1,26 @@
+import { Component, Optional } from '@angular/core';
+import { ValueInputComponent } from '../value-input.component';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../../process-form.component';
+
+/**
+ * Represents the user inputted value of a file parameter
+ */
+@Component({
+  selector: 'ds-file-value-input',
+  templateUrl: './file-value-input.component.html',
+  styleUrls: ['./file-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class FileValueInputComponent extends ValueInputComponent<File> {
+  /**
+   * The current value of the file
+   */
+  fileObject: File;
+  setFile(files) {
+    this.fileObject = files.length > 0 ? files[0] : undefined;
+    this.updateValue.emit(this.fileObject);
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
new file mode 100644
index 0000000000..57bd4ee7e5
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
@@ -0,0 +1,7 @@
+<div [ngSwitch]="parameter?.type">
+  <ds-string-value-input *ngSwitchCase="parameterTypes.STRING" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
+  <ds-string-value-input *ngSwitchCase="parameterTypes.OUTPUT" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
+  <ds-date-value-input *ngSwitchCase="parameterTypes.DATE" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-date-value-input>
+  <ds-file-value-input *ngSwitchCase="parameterTypes.FILE" (updateValue)="updateValue.emit($event)" [index]="index"></ds-file-value-input>
+  <ds-boolean-value-input *ngSwitchCase="parameterTypes.BOOLEAN" (updateValue)="updateValue.emit($event)" [index]="index"></ds-boolean-value-input>
+</div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
new file mode 100644
index 0000000000..4a89c4924d
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
@@ -0,0 +1,105 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ParameterValueInputComponent } from './parameter-value-input.component';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import { By } from '@angular/platform-browser';
+import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component';
+import { StringValueInputComponent } from './string-value-input/string-value-input.component';
+import { FileValueInputComponent } from './file-value-input/file-value-input.component';
+import { DateValueInputComponent } from './date-value-input/date-value-input.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { FileValueAccessorDirective } from '../../../../shared/utils/file-value-accessor.directive';
+import { FileValidator } from '../../../../shared/utils/require-file.validator';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+
+describe('ParameterValueInputComponent', () => {
+  let component: ParameterValueInputComponent;
+  let fixture: ComponentFixture<ParameterValueInputComponent>;
+  let booleanParameter;
+  let stringParameter;
+  let fileParameter;
+  let dateParameter;
+  let outputParameter;
+
+  function init() {
+    booleanParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.BOOLEAN });
+    stringParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.STRING });
+    fileParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.FILE });
+    dateParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.DATE });
+    outputParameter = Object.assign(new ScriptParameter(), { type: ScriptParameterType.OUTPUT });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [
+        ParameterValueInputComponent,
+        BooleanValueInputComponent,
+        StringValueInputComponent,
+        FileValueInputComponent,
+        DateValueInputComponent,
+        FileValueAccessorDirective,
+        FileValidator
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ParameterValueInputComponent);
+    component = fixture.componentInstance;
+    component.parameter = stringParameter;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should show a BooleanValueInputComponent when the parameter type is boolean', () => {
+    component.parameter = booleanParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(BooleanValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+
+  it('should show a StringValueInputComponent when the parameter type is string', () => {
+    component.parameter = stringParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(StringValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+
+  it('should show a FileValueInputComponent when the parameter type is file', () => {
+    component.parameter = fileParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(FileValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+
+  it('should show a DateValueInputComponent when the parameter type is date', () => {
+    component.parameter = dateParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(DateValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+
+  it('should show a StringValueInputComponent when the parameter type is output', () => {
+    component.parameter = outputParameter;
+    fixture.detectChanges();
+    const valueInput = fixture.debugElement.query(By.directive(StringValueInputComponent));
+    expect(valueInput).toBeTruthy();
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
new file mode 100644
index 0000000000..ec29ee5e1e
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
@@ -0,0 +1,39 @@
+import { Component, EventEmitter, Input, Optional, Output } from '@angular/core';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../process-form.component';
+
+/**
+ * Component that renders the correct parameter value input based the script parameter's type
+ */
+@Component({
+  selector: 'ds-parameter-value-input',
+  templateUrl: './parameter-value-input.component.html',
+  styleUrls: ['./parameter-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class ParameterValueInputComponent {
+  @Input() index: number;
+
+  /**
+   * The current script parameter
+   */
+  @Input() parameter: ScriptParameter;
+
+  /**
+   * Initial value for input
+   */
+  @Input() initialValue: any;
+  /**
+   * Emits the value of the input when its updated
+   */
+  @Output() updateValue: EventEmitter<any> = new EventEmitter();
+
+  /**
+   * The available script parameter types
+   */
+  parameterTypes = ScriptParameterType;
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
new file mode 100644
index 0000000000..246c62a0f6
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
@@ -0,0 +1,7 @@
+<input required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
+<div *ngIf="string.invalid && (string.dirty || string.touched)"
+     class="alert alert-danger validation-error">
+    <div *ngIf="string.errors.required">
+        {{'process.new.parameter.string.required' | translate}}
+    </div>
+</div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
new file mode 100644
index 0000000000..e702746adc
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
@@ -0,0 +1,72 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+
+import { FormsModule, NgForm } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { StringValueInputComponent } from './string-value-input.component';
+import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+
+describe('StringValueInputComponent', () => {
+  let component: StringValueInputComponent;
+  let fixture: ComponentFixture<StringValueInputComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [StringValueInputComponent],
+      providers: [
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StringValueInputComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show a validation error if the input field was left untouched but left empty', () => {
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  });
+
+  it('should show a validation error if the input field was touched but left empty', fakeAsync(() => {
+    component.value = '';
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeTruthy();
+  }));
+
+  it('should not show a validation error if the input field was touched but not left empty', fakeAsync(() => {
+    component.value = 'testValue';
+    fixture.detectChanges();
+    tick();
+
+    const input = fixture.debugElement.query(By.css('input'));
+    input.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  }));
+});
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
new file mode 100644
index 0000000000..0e55669432
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
@@ -0,0 +1,36 @@
+import { Component, Optional, Input } from '@angular/core';
+import { ValueInputComponent } from '../value-input.component';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../../../process-form.component';
+
+/**
+ * Represents the user inputted value of a string parameter
+ */
+@Component({
+  selector: 'ds-string-value-input',
+  templateUrl: './string-value-input.component.html',
+  styleUrls: ['./string-value-input.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class StringValueInputComponent extends ValueInputComponent<string> {
+  /**
+   * The current value of the string
+   */
+  value: string;
+
+  /**
+   * Initial value of the field
+   */
+  @Input() initialValue;
+
+  ngOnInit() {
+    this.value = this.initialValue;
+  }
+
+  setValue(value) {
+    this.value = value;
+    this.updateValue.emit(value)
+  }
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
new file mode 100644
index 0000000000..9e9a091dcd
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
@@ -0,0 +1,12 @@
+import { EventEmitter, Input, Output } from '@angular/core';
+
+/**
+ * Abstract class that represents value input components
+ */
+export abstract class ValueInputComponent<T> {
+  @Input() index: number;
+  /**
+   * Used by the subclasses to emit the value when it's updated
+   */
+  @Output() updateValue: EventEmitter<T> = new EventEmitter<T>()
+}
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.html b/src/app/process-page/form/process-parameters/process-parameters.component.html
new file mode 100644
index 0000000000..d7bbce6779
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.html
@@ -0,0 +1,11 @@
+<div class="form-group" *ngIf="script">
+    <label>{{'process.new.select-parameters' | translate}}</label>
+    <ds-parameter-select
+            *ngFor="let value of parameterValues; let i = index; let last = last"
+            [parameters]="script.parameters"
+            [parameterValue]="value"
+            [removable]="!last"
+            [index]="i"
+            (removeParameter)="removeParameter(i)"
+            (changeParameter)="updateParameter($event, i)"></ds-parameter-select>
+</div>
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.scss b/src/app/process-page/form/process-parameters/process-parameters.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
new file mode 100644
index 0000000000..3fc94d92a1
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
@@ -0,0 +1,64 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ProcessParametersComponent } from './process-parameters.component';
+import { ProcessParameter } from '../../processes/process-parameter.model';
+import { By } from '@angular/platform-browser';
+import { ParameterSelectComponent } from './parameter-select/parameter-select.component';
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { Script } from '../../scripts/script.model';
+import { ScriptParameter } from '../../scripts/script-parameter.model';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+
+describe('ProcessParametersComponent', () => {
+  let component: ProcessParametersComponent;
+  let fixture: ComponentFixture<ProcessParametersComponent>;
+  let parameterValues;
+  let script;
+
+  function init() {
+    const param1 = new ScriptParameter();
+    const param2 = new ScriptParameter();
+    script = Object.assign(new Script(), { parameters: [param1, param2] });
+    parameterValues = [
+      Object.assign(new ProcessParameter(), { name: '-a', value: 'bla' }),
+      Object.assign(new ProcessParameter(), { name: '-b', value: '123' }),
+      Object.assign(new ProcessParameter(), { name: '-c', value: 'value' }),
+    ]
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [ProcessParametersComponent, ParameterSelectComponent],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessParametersComponent);
+    component = fixture.componentInstance;
+    component.script = script;
+    component.parameterValues = parameterValues;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render a ParameterSelectComponent for each parameter value of the component', () => {
+    const selectComponents = fixture.debugElement.queryAll(By.directive(ParameterSelectComponent));
+    expect(selectComponents.length).toBe(parameterValues.length);
+  });
+});
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.ts b/src/app/process-page/form/process-parameters/process-parameters.component.ts
new file mode 100644
index 0000000000..de55f9ebca
--- /dev/null
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.ts
@@ -0,0 +1,114 @@
+import { Component, EventEmitter, Input, OnChanges, Optional, Output, SimpleChanges } from '@angular/core';
+import { Script } from '../../scripts/script.model';
+import { ProcessParameter } from '../../processes/process-parameter.model';
+import { hasValue } from '../../../shared/empty.util';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { ScriptParameter } from '../../scripts/script-parameter.model';
+import { controlContainerFactory } from '../process-form.component';
+
+/**
+ * Component that represents the selected list of parameters for a script
+ */
+@Component({
+  selector: 'ds-process-parameters',
+  templateUrl: './process-parameters.component.html',
+  styleUrls: ['./process-parameters.component.scss'],
+  viewProviders: [{
+    provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]]
+  }]
+})
+export class ProcessParametersComponent implements OnChanges {
+  /**
+   * The currently selected script
+   */
+  @Input() script: Script;
+
+  /**
+   * Initial parameters on load
+   */
+  @Input() initialParams: ProcessParameter[];
+  /**
+   * Emits the parameter values when they're updated
+   */
+  @Output() updateParameters: EventEmitter<ProcessParameter[]> = new EventEmitter();
+
+  /**
+   * The current parameter values
+   */
+  parameterValues: ProcessParameter[];
+
+  ngOnInit() {
+    if (hasValue(this.initialParams)) {
+      this.parameterValues = this.initialParams;
+    }
+  }
+
+  /**
+   * Makes sure the parameters are reset when the script changes
+   * @param changes
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.script) {
+      this.initParameters()
+    }
+  }
+
+  /**
+   * Empties the parameter values
+   * Initializes the first parameter value
+   */
+  initParameters() {
+    if (hasValue(this.initialParams)) {
+      this.parameterValues = this.initialParams;
+    } else {
+      this.parameterValues = [];
+      this.initializeParameter();
+    }
+  }
+
+  /**
+   * Updates a single parameter value using its new value and index
+   * Adds a new parameter when the last of the parameter values is changed
+   * @param processParameter The new value of the parameter
+   * @param index The index of the parameter
+   */
+  updateParameter(processParameter: ProcessParameter, index: number) {
+    this.parameterValues[index] = processParameter;
+    if (index === this.parameterValues.length - 1) {
+      this.addParameter();
+    }
+    this.updateParameters.emit(this.parameterValues.filter((param: ProcessParameter) => hasValue(param.name)));
+  }
+
+  /**
+   * Removes a parameter value from the list
+   * @param index The index of the parameter to remove
+   */
+  removeParameter(index: number) {
+    this.parameterValues = this.parameterValues.filter((value, i) => i !== index);
+    this.updateParameters.emit(this.parameterValues.filter((param: ProcessParameter) => hasValue(param.name)));
+  }
+
+  /**
+   * Initializes parameter values based on the selected script
+   */
+  initializeParameter() {
+    if (hasValue(this.script)) {
+      this.parameterValues = this.script.parameters
+        .filter((param) => param.mandatory)
+        .map(
+          (parameter: ScriptParameter) => Object.assign(new ProcessParameter(), { name: parameter.name })
+        );
+    }
+    this.addParameter();
+  }
+
+  /**
+   * Adds an empty parameter value to the end of the list
+   */
+  addParameter() {
+    this.parameterValues = [...this.parameterValues, new ProcessParameter()];
+  }
+}
diff --git a/src/app/process-page/form/script-help/script-help.component.html b/src/app/process-page/form/script-help/script-help.component.html
new file mode 100644
index 0000000000..f52ae4b6b9
--- /dev/null
+++ b/src/app/process-page/form/script-help/script-help.component.html
@@ -0,0 +1,22 @@
+<div class="text-secondary">
+  <h3>{{script?.name}}</h3>
+  <span>{{script?.description}}</span>
+
+  <table class="table-borderless mt-3">
+    <tr *ngFor="let param of script?.parameters">
+      <td class="align-top text-nowrap">{{param.name}} {{param.nameLong}}
+        <ng-container *ngTemplateOutlet="type; context: param"></ng-container>
+      </td>
+      <td>{{param.description}}</td>
+    </tr>
+  </table>
+</div>
+
+<ng-template #type let-type="type">
+    <ng-container [ngSwitch]="type">
+        <span *ngSwitchCase="parameterTypes.DATE"><{{'process.new.parameter.type.value' | translate}}></span>
+        <span *ngSwitchCase="parameterTypes.STRING"><{{'process.new.parameter.type.value' | translate}}></span>
+        <span *ngSwitchCase="parameterTypes.OUTPUT"><{{'process.new.parameter.type.value' | translate}}></span>
+        <span *ngSwitchCase="parameterTypes.FILE"><{{'process.new.parameter.type.file' | translate}}></span>
+    </ng-container>
+</ng-template>
diff --git a/src/app/process-page/form/script-help/script-help.component.scss b/src/app/process-page/form/script-help/script-help.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/form/script-help/script-help.component.spec.ts b/src/app/process-page/form/script-help/script-help.component.spec.ts
new file mode 100644
index 0000000000..4e4aa48276
--- /dev/null
+++ b/src/app/process-page/form/script-help/script-help.component.spec.ts
@@ -0,0 +1,65 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ScriptHelpComponent } from './script-help.component';
+import { ScriptParameter } from '../../scripts/script-parameter.model';
+import { Script } from '../../scripts/script.model';
+import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
+import { By } from '@angular/platform-browser';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { FormsModule } from '@angular/forms';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+
+describe('ScriptHelpComponent', () => {
+  let component: ScriptHelpComponent;
+  let fixture: ComponentFixture<ScriptHelpComponent>;
+  let script;
+
+  function init() {
+    const param1 = Object.assign(
+      new ScriptParameter(),
+      {name: '-d', description: 'Lorem ipsum dolor sit amet,', type: ScriptParameterType.DATE}
+    );
+    const param2 = Object.assign(
+      new ScriptParameter(),
+      {name: '-f', description: 'consetetur sadipscing elitr', type: ScriptParameterType.BOOLEAN}
+    );
+    script = Object.assign(new Script(), { parameters: [param1, param2] });
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [ ScriptHelpComponent ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ScriptHelpComponent);
+    component = fixture.componentInstance;
+    component.script = script;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should show the name and description for each parameter of the script', () => {
+    const rows = fixture.debugElement.queryAll(By.css('tr'));
+    expect(rows.length).toBe(script.parameters.length);
+    script.parameters.forEach((parameter, index) => {
+      expect(rows[index].queryAll(By.css('td'))[0].nativeElement.textContent).toContain(parameter.name);
+      expect(rows[index].queryAll(By.css('td'))[1].nativeElement.textContent.trim()).toEqual(parameter.description);
+    })
+  });
+});
diff --git a/src/app/process-page/form/script-help/script-help.component.ts b/src/app/process-page/form/script-help/script-help.component.ts
new file mode 100644
index 0000000000..7e230a4a42
--- /dev/null
+++ b/src/app/process-page/form/script-help/script-help.component.ts
@@ -0,0 +1,23 @@
+import { Component, Input } from '@angular/core';
+import { Script } from '../../scripts/script.model';
+import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
+
+/**
+ * Components that represents a help section for the script use and parameters
+ */
+@Component({
+  selector: 'ds-script-help',
+  templateUrl: './script-help.component.html',
+  styleUrls: ['./script-help.component.scss']
+})
+export class ScriptHelpComponent {
+  /**
+   * The current script to show the help information for
+   */
+  @Input() script: Script;
+
+  /**
+   * The available script parameter types
+   */
+  parameterTypes = ScriptParameterType;
+}
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
new file mode 100644
index 0000000000..9cd86d1a6d
--- /dev/null
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -0,0 +1,20 @@
+<div class="form-group" *ngIf="scripts$ | async">
+    <label for="process-script">{{'process.new.select-script' | translate}}</label>
+    <select required id="process-script"
+            class="form-control"
+            name="script"
+            [(ngModel)]="selectedScript"
+            #script="ngModel">
+        <option [ngValue]="undefined">{{'process.new.select-script.placeholder' | translate}}</option>
+        <option *ngFor="let script of scripts$ | async" [ngValue]="script.id">
+            {{script.name}}
+        </option>
+    </select>
+
+    <div *ngIf="script.invalid && (script.dirty || script.touched)"
+         class="alert alert-danger validation-error">
+        <div *ngIf="script.errors.required">
+            {{'process.new.select-script.required' | translate}}
+        </div>
+    </div>
+</div>
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.scss b/src/app/process-page/form/scripts-select/scripts-select.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
new file mode 100644
index 0000000000..db6d6e85b8
--- /dev/null
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
@@ -0,0 +1,99 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import { ScriptsSelectComponent } from './scripts-select.component';
+import { Script } from '../../scripts/script.model';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+
+describe('ScriptsSelectComponent', () => {
+  let component: ScriptsSelectComponent;
+  let fixture: ComponentFixture<ScriptsSelectComponent>;
+  let scriptService;
+  let script1;
+  let script2;
+
+  function init() {
+    script1 = new Script();
+    script2 = new Script();
+    scriptService = jasmine.createSpyObj('scriptService',
+      {
+        findAll: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [script1, script2]))
+      }
+    )
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [ScriptsSelectComponent],
+      providers: [
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: Router, useClass: RouterStub },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ScriptsSelectComponent);
+    component = fixture.componentInstance;
+    (component as any)._selectedScript = new Script();
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should not show a validation error if the input field was left untouched but left empty', () => {
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  });
+
+  it('should show a validation error if the input field was touched but left empty', fakeAsync(() => {
+    (component as any)._selectedScript.id = '';
+    fixture.detectChanges();
+    tick();
+
+    const select = fixture.debugElement.query(By.css('select'));
+    select.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeTruthy();
+  }));
+
+  it('should not show a validation error if the input field was touched but not left empty', fakeAsync(() => {
+    (component as any)._selectedScript.id = 'testValue';
+    fixture.detectChanges();
+    tick();
+
+    const select = fixture.debugElement.query(By.css('select'));
+    select.triggerEventHandler('blur', null);
+
+    fixture.detectChanges();
+
+    const validationError = fixture.debugElement.query(By.css('.validation-error'));
+    expect(validationError).toBeFalsy();
+  }));
+});
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
new file mode 100644
index 0000000000..1e3ecfda0d
--- /dev/null
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -0,0 +1,106 @@
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Optional, Output } from '@angular/core';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
+import { Script } from '../../scripts/script.model';
+import { Observable, Subscription } from 'rxjs';
+import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
+import { getRemoteDataPayload, getSucceededRemoteData } from '../../../core/shared/operators';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { ActivatedRoute, Params, Router } from '@angular/router';
+import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { ControlContainer, NgForm } from '@angular/forms';
+import { controlContainerFactory } from '../process-form.component';
+
+const SCRIPT_QUERY_PARAMETER = 'script';
+
+/**
+ * Component used to select a script
+ */
+@Component({
+  selector: 'ds-scripts-select',
+  templateUrl: './scripts-select.component.html',
+  styleUrls: ['./scripts-select.component.scss'],
+  viewProviders: [ { provide: ControlContainer,
+    useFactory: controlContainerFactory,
+    deps: [[new Optional(), NgForm]] } ]
+})
+export class ScriptsSelectComponent implements OnInit, OnDestroy {
+  /**
+   * Emits the selected script when the selection changes
+   */
+  @Output() select: EventEmitter<Script> = new EventEmitter<Script>();
+  /**
+   * All available scripts
+   */
+  scripts$: Observable<Script[]>;
+  private _selectedScript: Script;
+  private routeSub: Subscription;
+
+  constructor(
+    private scriptService: ScriptDataService,
+    private router: Router,
+    private route: ActivatedRoute,
+  ) {
+  }
+
+  /**
+   * Sets all available scripts
+   * Checks if the route contains a script ID and auto selects this scripts
+   */
+  ngOnInit() {
+    this.scripts$ = this.scriptService.findAll({ elementsPerPage: Number.MAX_SAFE_INTEGER })
+      .pipe(
+        getSucceededRemoteData(),
+        getRemoteDataPayload(),
+        map((paginatedList: PaginatedList<Script>) => paginatedList.page)
+      );
+
+    this.routeSub = this.route.queryParams
+      .pipe(
+        filter((params: Params) => hasNoValue(params.id)),
+        map((params: Params) => params[SCRIPT_QUERY_PARAMETER]),
+        distinctUntilChanged(),
+        switchMap((id: string) =>
+          this.scripts$
+            .pipe(
+              take(1),
+              map((scripts) =>
+                scripts.find((script) => script.id === id)
+              )
+            )
+        )
+      ).subscribe((script: Script) => {
+        this._selectedScript = script;
+        this.select.emit(script);
+      });
+  }
+
+  /**
+   * Returns the identifier of the selected script
+   */
+  get selectedScript(): string {
+    return this._selectedScript ? this._selectedScript.id : undefined;
+  }
+
+  /**
+   * Sets the currently selected script by navigating to the correct route using the scripts ID
+   * @param value The identifier of the script
+   */
+  set selectedScript(value: string) {
+    this.router.navigate([],
+      {
+        queryParams: { [SCRIPT_QUERY_PARAMETER]: value },
+      }
+    );
+  }
+
+  @Input()
+  set script(value: Script) {
+     this._selectedScript = value;
+  }
+
+  ngOnDestroy(): void {
+    if (hasValue(this.routeSub)) {
+      this.routeSub.unsubscribe();
+    }
+  }
+}
diff --git a/src/app/process-page/new/new-process.component.html b/src/app/process-page/new/new-process.component.html
new file mode 100644
index 0000000000..f61764ffd2
--- /dev/null
+++ b/src/app/process-page/new/new-process.component.html
@@ -0,0 +1,6 @@
+<ng-container *ngIf="fromExisting$ && (fromExisting$ | async)">
+    <ds-process-form *ngVar="fromExisting$ | async as process" headerKey="process.new.header" [selectedScript]="script$ | async" [parameters]="process.parameters"></ds-process-form>
+</ng-container>
+<ng-container *ngIf="!fromExisting$ || !(fromExisting$ | async)">
+    <ds-process-form headerKey="process.new.header"></ds-process-form>
+</ng-container>
diff --git a/src/app/process-page/new/new-process.component.scss b/src/app/process-page/new/new-process.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/process-page/new/new-process.component.spec.ts b/src/app/process-page/new/new-process.component.spec.ts
new file mode 100644
index 0000000000..bb3ad24ed3
--- /dev/null
+++ b/src/app/process-page/new/new-process.component.spec.ts
@@ -0,0 +1,84 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FormsModule } from '@angular/forms';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NewProcessComponent } from './new-process.component';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { Script } from '../scripts/script.model';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of as observableOf } from 'rxjs';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { RequestService } from '../../core/data/request.service';
+import { ActivatedRoute } from '@angular/router';
+import { LinkService } from '../../core/cache/builders/link.service';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+
+describe('NewProcessComponent', () => {
+  let component: NewProcessComponent;
+  let fixture: ComponentFixture<NewProcessComponent>;
+  let scriptService;
+  let parameterValues;
+  let script;
+
+  function init() {
+    const param1 = new ScriptParameter();
+    const param2 = new ScriptParameter();
+    script = Object.assign(new Script(), { parameters: [param1, param2] });
+    parameterValues = [
+      Object.assign(new ProcessParameter(), { name: '-a', value: 'bla' }),
+      Object.assign(new ProcessParameter(), { name: '-b', value: '123' }),
+      Object.assign(new ProcessParameter(), { name: '-c', value: 'value' }),
+    ];
+    scriptService = jasmine.createSpyObj(
+      'scriptService',
+      {
+        invoke: observableOf({
+          response:
+            {
+              isSuccessful: true
+            }
+        })
+      }
+    )
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })],
+      declarations: [NewProcessComponent, VarDirective],
+      providers: [
+        { provide: ScriptDataService, useValue: scriptService },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: RequestService, useValue: {} },
+        { provide: ActivatedRoute, useValue: { snapshot: { queryParams: {} } } },
+        { provide: LinkService, useValue: {} },
+        { provide: ProcessDataService, useValue: {} },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NewProcessComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/process-page/new/new-process.component.ts b/src/app/process-page/new/new-process.component.ts
new file mode 100644
index 0000000000..f97ce1bc6b
--- /dev/null
+++ b/src/app/process-page/new/new-process.component.ts
@@ -0,0 +1,47 @@
+import { Component, OnInit } from '@angular/core';
+import { Process } from '../processes/process.model';
+import { ActivatedRoute } from '@angular/router';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { Observable } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { LinkService } from '../../core/cache/builders/link.service';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { Script } from '../scripts/script.model';
+
+/**
+ * Component to create a new script
+ */
+@Component({
+  selector: 'ds-new-process',
+  templateUrl: './new-process.component.html',
+  styleUrls: ['./new-process.component.scss'],
+})
+export class NewProcessComponent implements OnInit {
+  /**
+   * Emits preselected process if there is one
+   */
+  fromExisting$?: Observable<Process>;
+  /**
+   * Emits preselected script if there is one
+   */
+  script$?: Observable<Script>;
+
+  constructor(private route: ActivatedRoute, private processService: ProcessDataService, private linkService: LinkService) {
+  }
+
+  /**
+   * If there's an id parameter, use this the process with this identifier as presets for the form
+   */
+  ngOnInit() {
+    const id = this.route.snapshot.queryParams.id;
+    if (id) {
+      this.fromExisting$ = this.processService.findById(id).pipe(getFirstSucceededRemoteDataPayload());
+      this.script$ = this.fromExisting$.pipe(
+        map((process: Process) => this.linkService.resolveLink<Process>(process, followLink('script'))),
+        switchMap((process: Process) => process.script),
+        getFirstSucceededRemoteDataPayload()
+      );
+    }
+  }
+}
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
new file mode 100644
index 0000000000..30eb44430e
--- /dev/null
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -0,0 +1,38 @@
+<div class="container">
+    <div class="d-flex">
+        <h2 class="flex-grow-1">{{'process.overview.title' | translate}}</h2>
+        <button class="btn btn-lg btn-success " routerLink="/processes/new"><i class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
+    </div>
+    <ds-pagination *ngIf="(processesRD$ | async)?.payload?.totalElements > 0"
+                   [paginationOptions]="pageConfig"
+                   [pageInfoState]="(processesRD$ | async)?.payload"
+                   [collectionSize]="(processesRD$ | async)?.payload?.totalElements"
+                   [hideGear]="true"
+                   [hidePagerWhenSinglePage]="true"
+                   (pageChange)="onPageChange($event)">
+        <div class="table-responsive">
+            <table class="table table-striped table-hover">
+                <thead>
+                <tr>
+                    <th scope="col">{{'process.overview.table.id' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.name' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.user' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.start' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.finish' | translate}}</th>
+                    <th scope="col">{{'process.overview.table.status' | translate}}</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr *ngFor="let process of (processesRD$ | async)?.payload?.page">
+                    <td><a [routerLink]="['/processes/', process.processId]">{{process.processId}}</a></td>
+                    <td><a [routerLink]="['/processes/', process.processId]">{{process.scriptName}}</a></td>
+                    <td *ngVar="(getEpersonName(process.userId) | async) as ePersonName">{{ePersonName}}</td>
+                    <td>{{process.startTime | date:dateFormat}}</td>
+                    <td>{{process.endTime | date:dateFormat}}</td>
+                    <td>{{process.processStatus}}</td>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </ds-pagination>
+</div>
diff --git a/src/app/process-page/overview/process-overview.component.spec.ts b/src/app/process-page/overview/process-overview.component.spec.ts
new file mode 100644
index 0000000000..bbdd7d7a6c
--- /dev/null
+++ b/src/app/process-page/overview/process-overview.component.spec.ts
@@ -0,0 +1,158 @@
+import { ProcessOverviewComponent } from './process-overview.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { Process } from '../processes/process.model';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { By } from '@angular/platform-browser';
+import { ProcessStatus } from '../processes/process-status.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+
+describe('ProcessOverviewComponent', () => {
+  let component: ProcessOverviewComponent;
+  let fixture: ComponentFixture<ProcessOverviewComponent>;
+
+  let processService: ProcessDataService;
+  let ePersonService: EPersonDataService;
+
+  let processes: Process[];
+  let ePerson: EPerson;
+
+  function init() {
+    processes = [
+      Object.assign(new Process(), {
+        processId: 1,
+        scriptName: 'script-name',
+        startTime: '2020-03-19',
+        endTime: '2020-03-19',
+        processStatus: ProcessStatus.COMPLETED
+      }),
+      Object.assign(new Process(), {
+        processId: 2,
+        scriptName: 'script-name',
+        startTime: '2020-03-20',
+        endTime: '2020-03-20',
+        processStatus: ProcessStatus.FAILED
+      }),
+      Object.assign(new Process(), {
+        processId: 3,
+        scriptName: 'another-script-name',
+        startTime: '2020-03-21',
+        endTime: '2020-03-21',
+        processStatus: ProcessStatus.RUNNING
+      })
+    ];
+    ePerson = Object.assign(new EPerson(), {
+      metadata: {
+        'eperson.firstname': [
+          {
+            value: 'John',
+            language: null
+          }
+        ],
+        'eperson.lastname': [
+          {
+            value: 'Doe',
+            language: null
+          }
+        ]
+      }
+    });
+    processService = jasmine.createSpyObj('processService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(processes))
+    });
+    ePersonService = jasmine.createSpyObj('ePersonService', {
+      findById: createSuccessfulRemoteDataObject$(ePerson)
+    });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [ProcessOverviewComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: ProcessDataService, useValue: processService },
+        { provide: EPersonDataService, useValue: ePersonService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessOverviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('table structure', () => {
+    let rowElements;
+
+    beforeEach(() => {
+      rowElements = fixture.debugElement.queryAll(By.css('tbody tr'));
+    });
+
+    it(`should contain 3 rows`, () => {
+      expect(rowElements.length).toEqual(3);
+    });
+
+    it('should display the process IDs in the first column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(1)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].processId);
+      });
+    });
+
+    it('should display the script names in the second column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(2)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].scriptName);
+      });
+    });
+
+    it('should display the eperson\'s name in the third column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(3)')).nativeElement;
+        expect(el.textContent).toContain(ePerson.name);
+      });
+    });
+
+    it('should display the start time in the fourth column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(4)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].startTime);
+      });
+    });
+
+    it('should display the end time in the fifth column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(5)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].endTime);
+      });
+    });
+
+    it('should display the status in the sixth column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(6)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].processStatus);
+      });
+    });
+  });
+
+  describe('onPageChange', () => {
+    const toPage = 2;
+
+    beforeEach(() => {
+      component.onPageChange(toPage);
+    });
+
+    it('should call a new findAll with the corresponding page', () => {
+      expect(processService.findAll).toHaveBeenCalledWith(jasmine.objectContaining({ currentPage: toPage }));
+    });
+  });
+});
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
new file mode 100644
index 0000000000..29fbb9d733
--- /dev/null
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -0,0 +1,86 @@
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { Process } from '../processes/process.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { FindListOptions } from '../../core/data/request.models';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { map } from 'rxjs/operators';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+
+@Component({
+  selector: 'ds-process-overview',
+  templateUrl: './process-overview.component.html',
+})
+/**
+ * Component displaying a list of all processes in a paginated table
+ */
+export class ProcessOverviewComponent implements OnInit {
+
+  /**
+   * List of all processes
+   */
+  processesRD$: Observable<RemoteData<PaginatedList<Process>>>;
+
+  /**
+   * The current pagination configuration for the page used by the FindAll method
+   */
+  config: FindListOptions = Object.assign(new FindListOptions(), {
+    elementsPerPage: 20
+  });
+
+  /**
+   * The current pagination configuration for the page
+   */
+  pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'process-overview-pagination',
+    pageSize: 20
+  });
+
+  /**
+   * Date format to use for start and end time of processes
+   */
+  dateFormat = 'yyyy-MM-dd HH:mm:ss';
+
+  constructor(protected processService: ProcessDataService,
+              protected ePersonService: EPersonDataService) {
+  }
+
+  ngOnInit(): void {
+    this.setProcesses();
+  }
+
+  /**
+   * When the page is changed, make sure to update the list of processes to match the new page
+   * @param event The page change event
+   */
+  onPageChange(event) {
+    this.config = Object.assign(new FindListOptions(), this.config, {
+      currentPage: event,
+    });
+    this.pageConfig.currentPage = event;
+    this.setProcesses();
+  }
+
+  /**
+   * Send a request to fetch all processes for the current page
+   */
+  setProcesses() {
+    this.processesRD$ = this.processService.findAll(this.config);
+  }
+
+  /**
+   * Get the name of an EPerson by ID
+   * @param id  ID of the EPerson
+   */
+  getEpersonName(id: string): Observable<string> {
+    return this.ePersonService.findById(id).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((eperson: EPerson) => eperson.name)
+    );
+  }
+
+}
diff --git a/src/app/process-page/process-breadcrumb.resolver.spec.ts b/src/app/process-page/process-breadcrumb.resolver.spec.ts
new file mode 100644
index 0000000000..4c2e6b8158
--- /dev/null
+++ b/src/app/process-page/process-breadcrumb.resolver.spec.ts
@@ -0,0 +1,40 @@
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { Process } from './processes/process.model';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+
+describe('ProcessBreadcrumbResolver', () => {
+  describe('resolve', () => {
+    let resolver: ProcessBreadcrumbResolver;
+    let processDataService: ProcessDataService;
+    let processBreadcrumbService: any;
+    let process: Process;
+    let id: string;
+    let path: string;
+    beforeEach(() => {
+      id = '12345';
+      process = Object.assign(new Process(), { id });
+      path = 'rest.com/path/to/breadcrumb/12345';
+      processBreadcrumbService = {};
+      processDataService = {
+        findById: () => createSuccessfulRemoteDataObject$(process)
+      } as any;
+      resolver = new ProcessBreadcrumbResolver(processBreadcrumbService, processDataService);
+    });
+
+    it('should resolve the breadcrumb config', (done) => {
+      const resolvedConfig = resolver.resolve({ data: { breadcrumbKey: process }, params: { id: id} } as any, {url: path} as any);
+      const expectedConfig = { provider: processBreadcrumbService, key: process, url: path};
+      resolvedConfig.subscribe((config) => {
+        expect(config).toEqual(expectedConfig);
+        done();
+      })
+    });
+
+    it('should resolve throw an error when no breadcrumbKey is defined', () => {
+      expect(() => {
+        resolver.resolve({ data: {} } as any, undefined)
+      }).toThrow();
+    });
+  });
+});
diff --git a/src/app/process-page/process-breadcrumb.resolver.ts b/src/app/process-page/process-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..a306060d20
--- /dev/null
+++ b/src/app/process-page/process-breadcrumb.resolver.ts
@@ -0,0 +1,40 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { map } from 'rxjs/operators';
+import { Process } from './processes/process.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { getRemoteDataPayload, getSucceededRemoteData } from '../core/shared/operators';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+
+/**
+ * This class represents a resolver that requests a specific process before the route is activated
+ */
+@Injectable()
+export class ProcessBreadcrumbResolver implements Resolve<BreadcrumbConfig<Process>> {
+  constructor(protected breadcrumbService: ProcessBreadcrumbsService, private processService: ProcessDataService) {
+  }
+
+  /**
+   * Method for resolving a process based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Process>> Emits the found process based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<BreadcrumbConfig<Process>> {
+    const id = route.params.id;
+
+    return this.processService.findById(route.params.id, followLink('script')).pipe(
+      getSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map((object: Process) => {
+        const fullPath = state.url;
+        const url = fullPath.substr(0, fullPath.indexOf(id)) + id;
+        return { provider: this.breadcrumbService, key: object, url: url };
+      })
+    );
+  }
+}
diff --git a/src/app/process-page/process-breadcrumbs.service.spec.ts b/src/app/process-page/process-breadcrumbs.service.spec.ts
new file mode 100644
index 0000000000..7751c985ce
--- /dev/null
+++ b/src/app/process-page/process-breadcrumbs.service.spec.ts
@@ -0,0 +1,36 @@
+import { async, TestBed } from '@angular/core/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
+import { Process } from './processes/process.model';
+
+describe('ProcessBreadcrumbsService', () => {
+  let service: ProcessBreadcrumbsService;
+  let exampleId;
+  let exampleScriptName;
+  let exampleProcess;
+  let exampleURL;
+
+  function init() {
+    exampleId = '12345';
+    exampleScriptName = 'Example Script';
+    exampleProcess = Object.assign(new Process(), {processId: exampleId, scriptName: exampleScriptName});
+    exampleURL = 'example.com';
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({}).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new ProcessBreadcrumbsService();
+  });
+
+  describe('getBreadcrumbs', () => {
+    it('should return a breadcrumb based on a id and scriptName of the process', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleProcess, exampleURL);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [new Breadcrumb(exampleId + ' - ' + exampleScriptName, exampleURL)] });
+    })
+  });
+});
diff --git a/src/app/process-page/process-breadcrumbs.service.ts b/src/app/process-page/process-breadcrumbs.service.ts
new file mode 100644
index 0000000000..ffd289e04e
--- /dev/null
+++ b/src/app/process-page/process-breadcrumbs.service.ts
@@ -0,0 +1,21 @@
+import { Observable, of as observableOf } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { BreadcrumbsService } from '../core/breadcrumbs/breadcrumbs.service';
+import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
+import { Process } from './processes/process.model';
+
+/**
+ * Service to calculate process breadcrumbs for a single part of the route
+ */
+@Injectable()
+export class ProcessBreadcrumbsService implements BreadcrumbsService<Process> {
+
+  /**
+   * Method to calculate the breadcrumbs
+   * @param key The key used to resolve the breadcrumb
+   * @param url The url to use as a link for this breadcrumb
+   */
+  getBreadcrumbs(key: Process, url: string): Observable<Breadcrumb[]> {
+    return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
+  }
+}
diff --git a/src/app/process-page/process-page-routing.module.ts b/src/app/process-page/process-page-routing.module.ts
new file mode 100644
index 0000000000..881ca0e853
--- /dev/null
+++ b/src/app/process-page/process-page-routing.module.ts
@@ -0,0 +1,50 @@
+import { RouterModule } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { NewProcessComponent } from './new/new-process.component';
+import { ProcessOverviewComponent } from './overview/process-overview.component';
+import { ProcessPageResolver } from './process-page.resolver';
+import { ProcessDetailComponent } from './detail/process-detail.component';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { breadcrumbKey: 'process.overview' },
+        canActivate: [AuthenticatedGuard],
+        children: [
+          {
+            path: '',
+            component: ProcessOverviewComponent,
+            data: { title: 'process.overview.title' },
+          },
+          {
+            path: 'new',
+            component: NewProcessComponent,
+            resolve: { breadcrumb: I18nBreadcrumbResolver },
+            data: { title: 'process.new.title', breadcrumbKey: 'process.new' }
+          },
+          {
+            path: ':id',
+            component: ProcessDetailComponent,
+            resolve: {
+              process: ProcessPageResolver,
+              breadcrumb: ProcessBreadcrumbResolver
+            }
+          }
+        ]
+      },
+
+    ])
+  ],
+  providers: [
+    ProcessPageResolver
+  ]
+})
+export class ProcessPageRoutingModule {
+
+}
diff --git a/src/app/process-page/process-page.module.ts b/src/app/process-page/process-page.module.ts
new file mode 100644
index 0000000000..44e3f62701
--- /dev/null
+++ b/src/app/process-page/process-page.module.ts
@@ -0,0 +1,51 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '../shared/shared.module';
+import { ProcessPageRoutingModule } from './process-page-routing.module';
+import { NewProcessComponent } from './new/new-process.component';
+import { ScriptsSelectComponent } from './form/scripts-select/scripts-select.component';
+import { ScriptHelpComponent } from './form/script-help/script-help.component';
+import { ParameterSelectComponent } from './form/process-parameters/parameter-select/parameter-select.component';
+import { ProcessParametersComponent } from './form/process-parameters/process-parameters.component';
+import { StringValueInputComponent } from './form/process-parameters/parameter-value-input/string-value-input/string-value-input.component';
+import { ParameterValueInputComponent } from './form/process-parameters/parameter-value-input/parameter-value-input.component';
+import { FileValueInputComponent } from './form/process-parameters/parameter-value-input/file-value-input/file-value-input.component';
+import { BooleanValueInputComponent } from './form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component';
+import { DateValueInputComponent } from './form/process-parameters/parameter-value-input/date-value-input/date-value-input.component';
+import { ProcessOverviewComponent } from './overview/process-overview.component';
+import { ProcessDetailComponent } from './detail/process-detail.component';
+import { ProcessDetailFieldComponent } from './detail/process-detail-field/process-detail-field.component';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { ProcessFormComponent } from './form/process-form.component';
+
+@NgModule({
+  imports: [
+    ProcessPageRoutingModule,
+    SharedModule,
+  ],
+  declarations: [
+    NewProcessComponent,
+    ScriptsSelectComponent,
+    ScriptHelpComponent,
+    ParameterSelectComponent,
+    ProcessParametersComponent,
+    StringValueInputComponent,
+    ParameterValueInputComponent,
+    FileValueInputComponent,
+    BooleanValueInputComponent,
+    DateValueInputComponent,
+    ProcessOverviewComponent,
+    ProcessDetailComponent,
+    ProcessDetailFieldComponent,
+    ProcessFormComponent
+  ],
+  providers: [
+    ProcessBreadcrumbResolver,
+    ProcessBreadcrumbsService
+  ],
+  entryComponents: []
+})
+
+export class ProcessPageModule {
+
+}
diff --git a/src/app/process-page/process-page.resolver.ts b/src/app/process-page/process-page.resolver.ts
new file mode 100644
index 0000000000..84821a2574
--- /dev/null
+++ b/src/app/process-page/process-page.resolver.ts
@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { RemoteData } from '../core/data/remote-data';
+import { Observable } from 'rxjs/internal/Observable';
+import { find } from 'rxjs/operators';
+import { hasValue } from '../shared/empty.util';
+import { Process } from './processes/process.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+
+/**
+ * This class represents a resolver that requests a specific process before the route is activated
+ */
+@Injectable()
+export class ProcessPageResolver implements Resolve<RemoteData<Process>> {
+  constructor(private processService: ProcessDataService) {
+  }
+
+  /**
+   * Method for resolving a process based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Process>> Emits the found process based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Process>> {
+    return this.processService.findById(route.params.id, followLink('script')).pipe(
+      find((RD) => hasValue(RD.error) || RD.hasSucceeded),
+    );
+  }
+}
diff --git a/src/app/process-page/processes/process-parameter.model.ts b/src/app/process-page/processes/process-parameter.model.ts
new file mode 100644
index 0000000000..a3ce62c5c6
--- /dev/null
+++ b/src/app/process-page/processes/process-parameter.model.ts
@@ -0,0 +1,14 @@
+/**
+ * A parameter used for running a process
+ */
+export class ProcessParameter {
+  /**
+   * The name of the parameter Eg. '-d', '-f' etc.
+   */
+  name: string;
+
+  /**
+   * The value of the parameter
+   */
+  value: any;
+}
diff --git a/src/app/process-page/processes/process-status.model.ts b/src/app/process-page/processes/process-status.model.ts
new file mode 100644
index 0000000000..b43340bffb
--- /dev/null
+++ b/src/app/process-page/processes/process-status.model.ts
@@ -0,0 +1,9 @@
+/**
+ * List of process statuses
+ */
+export enum ProcessStatus {
+  SCHEDULED,
+  RUNNING,
+  COMPLETED,
+  FAILED
+}
diff --git a/src/app/process-page/processes/process.model.ts b/src/app/process-page/processes/process.model.ts
new file mode 100644
index 0000000000..85de5337e7
--- /dev/null
+++ b/src/app/process-page/processes/process.model.ts
@@ -0,0 +1,88 @@
+import { ProcessStatus } from './process-status.model';
+import { ProcessParameter } from './process-parameter.model';
+import { CacheableObject } from '../../core/cache/object-cache.reducer';
+import { HALLink } from '../../core/shared/hal-link.model';
+import { autoserialize, deserialize } from 'cerialize';
+import { PROCESS } from './process.resource-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { ResourceType } from '../../core/shared/resource-type';
+import { link, typedObject } from '../../core/cache/builders/build-decorators';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { SCRIPT } from '../scripts/script.resource-type';
+import { Script } from '../scripts/script.model';
+
+/**
+ * Object representing a process
+ */
+@typedObject
+export class Process implements CacheableObject {
+  static type = PROCESS;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The identifier for this process
+   */
+  @autoserialize
+  processId: string;
+
+  /**
+   * The UUID for the user that started the process
+   */
+  @autoserialize
+  userId: string;
+
+  /**
+   * The start time for this process
+   */
+  @autoserialize
+  startTime: string;
+
+  /**
+   * The end time for this process
+   */
+  @autoserialize
+  endTime: string;
+
+  /**
+   * The name of the script run by this process
+   */
+  @autoserialize
+  scriptName: string;
+
+  /**
+   * The status of this process
+   */
+  @autoserialize
+  processStatus: ProcessStatus;
+
+  /**
+   * The parameters for this process
+   */
+  @autoserialize
+  parameters: ProcessParameter[];
+
+  /**
+   * The {@link HALLink}s for this Process
+   */
+  @deserialize
+  _links: {
+    self: HALLink,
+    script: HALLink,
+    output: HALLink,
+    files: HALLink
+  };
+
+  /**
+   * The Script that created this Process
+   * Will be undefined unless the script {@link HALLink} has been resolved.
+   */
+  @link(SCRIPT)
+  script?: Observable<RemoteData<Script>>;
+}
diff --git a/src/app/process-page/processes/process.resource-type.ts b/src/app/process-page/processes/process.resource-type.ts
new file mode 100644
index 0000000000..47617ed4f4
--- /dev/null
+++ b/src/app/process-page/processes/process.resource-type.ts
@@ -0,0 +1,9 @@
+/**
+ * The resource type for Process
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+import { ResourceType } from '../../core/shared/resource-type';
+
+export const PROCESS = new ResourceType('process');
diff --git a/src/app/process-page/scripts/script-parameter-type.model.ts b/src/app/process-page/scripts/script-parameter-type.model.ts
new file mode 100644
index 0000000000..2b9fd358bf
--- /dev/null
+++ b/src/app/process-page/scripts/script-parameter-type.model.ts
@@ -0,0 +1,10 @@
+/**
+ * List of parameter types used for scripts
+ */
+export enum ScriptParameterType {
+  STRING = 'String',
+  DATE = 'date',
+  BOOLEAN = 'boolean',
+  FILE = 'InputStream',
+  OUTPUT = 'OutputStream'
+}
diff --git a/src/app/process-page/scripts/script-parameter.model.ts b/src/app/process-page/scripts/script-parameter.model.ts
new file mode 100644
index 0000000000..d6debe7dd7
--- /dev/null
+++ b/src/app/process-page/scripts/script-parameter.model.ts
@@ -0,0 +1,31 @@
+import { ScriptParameterType } from './script-parameter-type.model';
+
+/**
+ * A parameter that can be used when running a script
+ */
+export class ScriptParameter {
+  /**
+   * The name of the parameter Eg. '-d', '-f' etc.
+   */
+  name: string;
+
+  /**
+   * Short description about the purpose of this parameter
+   */
+  description: string;
+
+  /**
+   * The type of parameter
+   */
+  type: ScriptParameterType;
+
+  /**
+   * The long name for this parameter Eg. '--directory', '--force' etc.
+   */
+  nameLong: string;
+
+  /**
+   * Whether or not this parameter is mandatory
+   */
+  mandatory: boolean;
+}
diff --git a/src/app/process-page/scripts/script.model.ts b/src/app/process-page/scripts/script.model.ts
new file mode 100644
index 0000000000..e94d233fc2
--- /dev/null
+++ b/src/app/process-page/scripts/script.model.ts
@@ -0,0 +1,55 @@
+import { CacheableObject } from '../../core/cache/object-cache.reducer';
+import { HALLink } from '../../core/shared/hal-link.model';
+import { autoserialize, deserialize } from 'cerialize';
+import { SCRIPT } from './script.resource-type';
+import { ScriptParameter } from './script-parameter.model';
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { ResourceType } from '../../core/shared/resource-type';
+
+/**
+ * Object representing a script
+ */
+@typedObject
+export class Script implements CacheableObject {
+  static type = SCRIPT;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The identifier of this script
+   */
+  @autoserialize
+  id: string;
+
+  /**
+   * The name of this script
+   */
+  @autoserialize
+  name: string;
+
+  /**
+   * A short description of this script
+   */
+  @autoserialize
+  description: string;
+
+  /**
+   * The available parameters for this script
+   */
+  @autoserialize
+  parameters: ScriptParameter[];
+
+  /**
+   * The {@link HALLink}s for this Script
+   */
+  @deserialize
+  _links: {
+    self: HALLink,
+  };
+}
diff --git a/src/app/process-page/scripts/script.resource-type.ts b/src/app/process-page/scripts/script.resource-type.ts
new file mode 100644
index 0000000000..2b8c106191
--- /dev/null
+++ b/src/app/process-page/scripts/script.resource-type.ts
@@ -0,0 +1,9 @@
+/**
+ * The resource type for Script
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+import { ResourceType } from '../../core/shared/resource-type';
+
+export const SCRIPT = new ResourceType('script');
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
index 50a081c6f2..ad9f768297 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
@@ -1,9 +1,10 @@
-<div class="container-fluid mb-4">{{'profile.security.form.info' | translate}}</div>
+<div class="container-fluid mb-4">{{FORM_PREFIX + 'info' | translate}}</div>
 <ds-form *ngIf="formModel"
-         [formId]="'profile-page-security-form-id'"
+         [formId]="FORM_PREFIX"
          [formModel]="formModel"
          [formGroup]="formGroup"
          [displaySubmit]="false">
 </ds-form>
-<div class="container-fluid text-danger" *ngIf="formGroup.hasError('notLongEnough')">{{'profile.security.form.error.password-length' | translate}}</div>
-<div class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{'profile.security.form.error.matching-passwords' | translate}}</div>
+<div id="notLongEnough" class="container-fluid text-danger" *ngIf="formGroup.hasError('notLongEnough')">{{FORM_PREFIX + 'error.password-length' | translate}}</div>
+<div id="notSame" class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
+<div id="emptyPassword" class="container-fluid text-danger" *ngIf="(formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
index 225bd8507e..ba487f7158 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
@@ -1,5 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { VarDirective } from '../../shared/utils/var.directive';
 import { TranslateModule } from '@ngx-translate/core';
@@ -15,18 +14,10 @@ describe('ProfilePageSecurityFormComponent', () => {
   let component: ProfilePageSecurityFormComponent;
   let fixture: ComponentFixture<ProfilePageSecurityFormComponent>;
 
-  let user;
-
   let epersonService;
   let notificationsService;
 
   function init() {
-    user = Object.assign(new EPerson(), {
-      _links: {
-        self: { href: 'user-selflink' }
-      }
-    });
-
     epersonService = jasmine.createSpyObj('epersonService', {
       patch: observableOf(new RestResponse(true, 200, 'OK'))
     });
@@ -43,8 +34,8 @@ describe('ProfilePageSecurityFormComponent', () => {
       declarations: [ProfilePageSecurityFormComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: EPersonDataService, useValue: epersonService },
-        { provide: NotificationsService, useValue: notificationsService },
+        {provide: EPersonDataService, useValue: epersonService},
+        {provide: NotificationsService, useValue: notificationsService},
         FormBuilderService
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -54,65 +45,35 @@ describe('ProfilePageSecurityFormComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(ProfilePageSecurityFormComponent);
     component = fixture.componentInstance;
-    component.user = user;
     fixture.detectChanges();
   });
 
-  describe('updateSecurity', () => {
-    describe('when no values changed', () => {
-      let result;
-
+  describe('On value change', () => {
+    describe('when the password has changed', () => {
       beforeEach(() => {
-        result = component.updateSecurity();
+        component.formGroup.patchValue({password: 'password'});
+        component.formGroup.patchValue({passwordrepeat: 'password'});
       });
 
-      it('should return false', () => {
-        expect(result).toEqual(false);
-      });
+      it('should emit the value and validity on password change with invalid validity', fakeAsync(() => {
+        spyOn(component.passwordValue, 'emit');
+        spyOn(component.isInvalid, 'emit');
+        component.formGroup.patchValue({password: 'new-password'});
 
-      it('should not call epersonService.patch', () => {
-        expect(epersonService.patch).not.toHaveBeenCalled();
-      });
-    });
+        tick(300);
 
-    describe('when password is filled in, but the confirm field is empty', () => {
-      let result;
+        expect(component.passwordValue.emit).toHaveBeenCalledWith('new-password');
+        expect(component.isInvalid.emit).toHaveBeenCalledWith(true);
+      }));
 
-      beforeEach(() => {
-        setModelValue('password', 'test');
-        result = component.updateSecurity();
-      });
+      it('should emit the value on password change', fakeAsync(() => {
+        spyOn(component.passwordValue, 'emit');
+        component.formGroup.patchValue({password: 'new-password'});
 
-      it('should return true', () => {
-        expect(result).toEqual(true);
-      });
-    });
+        tick(300);
 
-    describe('when both password fields are filled in, long enough and equal', () => {
-      let result;
-      let operations;
-
-      beforeEach(() => {
-        setModelValue('password', 'testest');
-        setModelValue('passwordrepeat', 'testest');
-        operations = [{ op: 'replace', path: '/password', value: 'testest' }];
-        result = component.updateSecurity();
-      });
-
-      it('should return true', () => {
-        expect(result).toEqual(true);
-      });
-
-      it('should return call epersonService.patch', () => {
-        expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
-      });
+        expect(component.passwordValue.emit).toHaveBeenCalledWith('new-password');
+      }));
     });
   });
-
-  function setModelValue(id: string, value: string) {
-    component.formGroup.patchValue({
-      [id]: value
-    });
-    component.formGroup.markAllAsTouched();
-  }
 });
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index b8ac07e6d8..1013cad44b 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -1,16 +1,12 @@
-import { Component, Input, OnInit } from '@angular/core';
-import {
-  DynamicFormControlModel,
-  DynamicFormService,
-  DynamicInputModel
-} from '@ng-dynamic-forms/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
 import { FormGroup } from '@angular/forms';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { hasValue, isEmpty } from '../../shared/empty.util';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { ErrorResponse, RestResponse } from '../../core/cache/response.models';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { debounceTime, map } from 'rxjs/operators';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'ds-profile-page-security-form',
@@ -21,10 +17,15 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
  * Displays a form containing a password field and a confirmation of the password
  */
 export class ProfilePageSecurityFormComponent implements OnInit {
+
   /**
-   * The user to display the form for
+   * Emits the validity of the password
    */
-  @Input() user: EPerson;
+  @Output() isInvalid = new EventEmitter<boolean>();
+  /**
+   * Emits the value of the password
+   */
+  @Output() passwordValue = new EventEmitter<string>();
 
   /**
    * The form's input models
@@ -48,14 +49,17 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   formGroup: FormGroup;
 
   /**
-   * Prefix for the notification messages of this component
+   * Indicates whether the "checkPasswordEmpty" needs to be added or not
    */
-  NOTIFICATIONS_PREFIX = 'profile.security.form.notifications.';
+  @Input()
+  passwordCanBeEmpty = true;
 
   /**
    * Prefix for the form's label messages of this component
    */
-  LABEL_PREFIX = 'profile.security.form.label.';
+  @Input()
+  FORM_PREFIX: string;
+  private subs: Subscription[] = [];
 
   constructor(protected formService: DynamicFormService,
               protected translate: TranslateService,
@@ -64,12 +68,35 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.formGroup = this.formService.createFormGroup(this.formModel, { validators: [this.checkPasswordsEqual, this.checkPasswordLength] });
+    if (this.passwordCanBeEmpty) {
+      this.formGroup = this.formService.createFormGroup(this.formModel,
+        {validators: [this.checkPasswordsEqual, this.checkPasswordLength]});
+    } else {
+      this.formGroup = this.formService.createFormGroup(this.formModel,
+        {validators: [this.checkPasswordsEqual, this.checkPasswordLength, this.checkPasswordEmpty]});
+    }
     this.updateFieldTranslations();
     this.translate.onLangChange
       .subscribe(() => {
         this.updateFieldTranslations();
       });
+
+    this.subs.push(this.formGroup.statusChanges.pipe(
+      debounceTime(300),
+      map((status: string) => {
+        if (status !== 'VALID') {
+          return true;
+        } else {
+          return false;
+        }
+      })).subscribe((status) => this.isInvalid.emit(status))
+    );
+
+    this.subs.push(this.formGroup.valueChanges.pipe(
+      debounceTime(300),
+    ).subscribe((valueChange) => {
+      this.passwordValue.emit(valueChange.password);
+    }));
   }
 
   /**
@@ -78,7 +105,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   updateFieldTranslations() {
     this.formModel.forEach(
       (fieldModel: DynamicInputModel) => {
-        fieldModel.label = this.translate.instant(this.LABEL_PREFIX + fieldModel.id);
+        fieldModel.label = this.translate.instant(this.FORM_PREFIX + 'label.' + fieldModel.id);
       }
     );
   }
@@ -91,7 +118,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     const pass = group.get('password').value;
     const repeatPass = group.get('passwordrepeat').value;
 
-    return pass === repeatPass ? null : { notSame: true };
+    return pass === repeatPass ? null : {notSame: true};
   }
 
   /**
@@ -101,51 +128,24 @@ export class ProfilePageSecurityFormComponent implements OnInit {
   checkPasswordLength(group: FormGroup) {
     const pass = group.get('password').value;
 
-    return isEmpty(pass) || pass.length >= 6 ? null : { notLongEnough: true };
+    return isEmpty(pass) || pass.length >= 6 ? null : {notLongEnough: true};
   }
 
   /**
-   * Update the user's security details
-   *
-   * Sends a patch request for changing the user's password when a new password is present and the password confirmation
-   * matches the new password.
-   * Nothing happens when no passwords are filled in.
-   * An error notification is displayed when the password confirmation does not match the new password.
-   *
-   * Returns false when nothing happened
+   * Checks if the password is empty
+   * @param group The FormGroup to validate
    */
-  updateSecurity() {
-    const pass = this.formGroup.get('password').value;
-    const passEntered = isNotEmpty(pass);
-    if (!this.formGroup.valid) {
-      if (passEntered) {
-        if (this.checkPasswordsEqual(this.formGroup) != null) {
-          this.notificationsService.error(this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.not-same'));
-        }
-        if (this.checkPasswordLength(this.formGroup) != null) {
-          this.notificationsService.error(this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.not-long-enough'));
-        }
-        return true;
-      }
-      return false;
-    }
-    if (passEntered) {
-      const operation = Object.assign({ op: 'replace', path: '/password', value: pass });
-      this.epersonService.patch(this.user, [operation]).subscribe((response: RestResponse) => {
-        if (response.isSuccessful) {
-          this.notificationsService.success(
-            this.translate.instant(this.NOTIFICATIONS_PREFIX + 'success.title'),
-            this.translate.instant(this.NOTIFICATIONS_PREFIX + 'success.content')
-          );
-        } else {
-          this.notificationsService.error(
-            this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.title'), (response as ErrorResponse).errorMessage
-          );
-        }
-      });
+  checkPasswordEmpty(group: FormGroup) {
+    const pass = group.get('password').value;
+    return isEmpty(pass) ? {emptyPassword: true} : null;
+  }
 
-    }
-
-    return passEntered;
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
   }
 }
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index b6e62665b4..ab8f1ce026 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -10,7 +10,11 @@
     <div class="card mb-4">
       <div class="card-header">{{'profile.card.security' | translate}}</div>
       <div class="card-body">
-        <ds-profile-page-security-form [user]="user"></ds-profile-page-security-form>
+        <ds-profile-page-security-form
+                [FORM_PREFIX]="'profile.security.form.'"
+                (isInvalid)="setInvalid($event)"
+                (passwordValue)="setPasswordValue($event)"
+        ></ds-profile-page-security-form>
       </div>
     </div>
     <button class="btn btn-outline-primary" (click)="updateProfile()">{{'profile.form.submit' | translate}}</button>
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index d63aba46f5..8d78539bab 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -13,8 +13,9 @@ import { NotificationsService } from '../shared/notifications/notifications.serv
 import { authReducer } from '../core/auth/auth.reducer';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { createPaginatedList } from '../shared/testing/utils.test';
-import { of } from 'rxjs/internal/observable/of';
+import { of as observableOf } from 'rxjs';
 import { AuthService } from '../core/auth/auth.service';
+import { RestResponse } from '../core/cache/response.models';
 
 describe('ProfilePageComponent', () => {
   let component: ProfilePageComponent;
@@ -40,10 +41,11 @@ describe('ProfilePageComponent', () => {
     };
 
     authService = jasmine.createSpyObj('authService', {
-      getAuthenticatedUserFromStore: of(user)
+      getAuthenticatedUserFromStore: observableOf(user)
     });
     epersonService = jasmine.createSpyObj('epersonService', {
-      findById: createSuccessfulRemoteDataObject$(user)
+      findById: createSuccessfulRemoteDataObject$(user),
+      patch: observableOf(Object.assign(new RestResponse(true, 200, 'Success')))
     });
     notificationsService = jasmine.createSpyObj('notificationsService', {
       success: {},
@@ -84,9 +86,7 @@ describe('ProfilePageComponent', () => {
         component.metadataForm = jasmine.createSpyObj('metadataForm', {
           updateProfile: false
         });
-        component.securityForm = jasmine.createSpyObj('securityForm', {
-          updateSecurity: true
-        });
+        spyOn(component, 'updateSecurity').and.returnValue(true);
         component.updateProfile();
       });
 
@@ -100,9 +100,6 @@ describe('ProfilePageComponent', () => {
         component.metadataForm = jasmine.createSpyObj('metadataForm', {
           updateProfile: true
         });
-        component.securityForm = jasmine.createSpyObj('securityForm', {
-          updateSecurity: false
-        });
         component.updateProfile();
       });
 
@@ -116,9 +113,6 @@ describe('ProfilePageComponent', () => {
         component.metadataForm = jasmine.createSpyObj('metadataForm', {
           updateProfile: true
         });
-        component.securityForm = jasmine.createSpyObj('securityForm', {
-          updateSecurity: true
-        });
         component.updateProfile();
       });
 
@@ -132,9 +126,6 @@ describe('ProfilePageComponent', () => {
         component.metadataForm = jasmine.createSpyObj('metadataForm', {
           updateProfile: false
         });
-        component.securityForm = jasmine.createSpyObj('securityForm', {
-          updateSecurity: false
-        });
         component.updateProfile();
       });
 
@@ -143,4 +134,60 @@ describe('ProfilePageComponent', () => {
       });
     });
   });
+
+  describe('updateSecurity', () => {
+    describe('when no password value present', () => {
+      let result;
+
+      beforeEach(() => {
+        component.setPasswordValue('');
+
+        result = component.updateSecurity();
+      });
+
+      it('should return false', () => {
+        expect(result).toEqual(false);
+      });
+
+      it('should not call epersonService.patch', () => {
+        expect(epersonService.patch).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when password is filled in, but the password is invalid', () => {
+      let result;
+
+      beforeEach(() => {
+        component.setPasswordValue('test');
+        component.setInvalid(true);
+        result = component.updateSecurity();
+      });
+
+      it('should return true', () => {
+        expect(result).toEqual(true);
+        expect(epersonService.patch).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when password is filled in, and is valid', () => {
+      let result;
+      let operations;
+
+      beforeEach(() => {
+        component.setPasswordValue('testest');
+        component.setInvalid(false);
+
+        operations = [{op: 'replace', path: '/password', value: 'testest'}];
+        result = component.updateSecurity();
+      });
+
+      it('should return true', () => {
+        expect(result).toEqual(true);
+      });
+
+      it('should return call epersonService.patch', () => {
+        expect(epersonService.patch).toHaveBeenCalledWith(user, operations);
+      });
+    });
+  });
 });
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 8f4cd492a2..bc06c49f81 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -2,7 +2,6 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { Observable } from 'rxjs/internal/Observable';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
-import { ProfilePageSecurityFormComponent } from './profile-page-security-form/profile-page-security-form.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Group } from '../core/eperson/models/group.model';
@@ -11,9 +10,10 @@ import { PaginatedList } from '../core/data/paginated-list';
 import { filter, switchMap, tap } from 'rxjs/operators';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { getAllSucceededRemoteData, getRemoteDataPayload } from '../core/shared/operators';
-import { hasValue } from '../shared/empty.util';
+import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { followLink } from '../shared/utils/follow-link-config.model';
 import { AuthService } from '../core/auth/auth.service';
+import { ErrorResponse, RestResponse } from '../core/cache/response.models';
 
 @Component({
   selector: 'ds-profile-page',
@@ -26,15 +26,10 @@ export class ProfilePageComponent implements OnInit {
   /**
    * A reference to the metadata form component
    */
-  @ViewChild(ProfilePageMetadataFormComponent, { static: false }) metadataForm: ProfilePageMetadataFormComponent;
+  @ViewChild(ProfilePageMetadataFormComponent, {static: false}) metadataForm: ProfilePageMetadataFormComponent;
 
   /**
-   * A reference to the security form component
-   */
-  @ViewChild(ProfilePageSecurityFormComponent, { static: false }) securityForm: ProfilePageSecurityFormComponent;
-
-  /**
-   * The authenticated user
+   * The authenticated user as observable
    */
   user$: Observable<EPerson>;
 
@@ -48,6 +43,26 @@ export class ProfilePageComponent implements OnInit {
    */
   NOTIFICATIONS_PREFIX = 'profile.notifications.';
 
+  /**
+   * Prefix for the notification messages of this security form
+   */
+  PASSWORD_NOTIFICATIONS_PREFIX = 'profile.security.form.notifications.';
+
+  /**
+   * The validity of the password filled in, in the security form
+   */
+  private invalidSecurity: boolean;
+
+  /**
+   * The password filled in, in the security form
+   */
+  private password: string;
+
+  /**
+   * The authenticated user
+   */
+  private currentUser: EPerson;
+
   constructor(private authService: AuthService,
               private notificationsService: NotificationsService,
               private translate: TranslateService,
@@ -59,7 +74,8 @@ export class ProfilePageComponent implements OnInit {
       filter((user: EPerson) => hasValue(user.id)),
       switchMap((user: EPerson) => this.epersonService.findById(user.id, followLink('groups'))),
       getAllSucceededRemoteData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
+      tap((user: EPerson) => this.currentUser = user)
     );
     this.groupsRD$ = this.user$.pipe(switchMap((user: EPerson) => user.groups));
   }
@@ -70,7 +86,7 @@ export class ProfilePageComponent implements OnInit {
    */
   updateProfile() {
     const metadataChanged = this.metadataForm.updateProfile();
-    const securityChanged = this.securityForm.updateSecurity();
+    const securityChanged = this.updateSecurity();
     if (!metadataChanged && !securityChanged) {
       this.notificationsService.warning(
         this.translate.instant(this.NOTIFICATIONS_PREFIX + 'warning.no-changes.title'),
@@ -78,4 +94,61 @@ export class ProfilePageComponent implements OnInit {
       );
     }
   }
+
+  /**
+   * Sets the validity of the password based on an emitted of the form
+   * @param $event
+   */
+  setInvalid($event: boolean) {
+    this.invalidSecurity = $event;
+  }
+
+  /**
+   * Update the user's security details
+   *
+   * Sends a patch request for changing the user's password when a new password is present and the password confirmation
+   * matches the new password.
+   * Nothing happens when no passwords are filled in.
+   * An error notification is displayed when the password confirmation does not match the new password.
+   *
+   * Returns false when the password was empty
+   */
+  updateSecurity() {
+    const passEntered = isNotEmpty(this.password);
+
+    if (this.invalidSecurity) {
+      this.notificationsService.error(this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.general'));
+    }
+    if (!this.invalidSecurity && passEntered) {
+      const operation = Object.assign({op: 'replace', path: '/password', value: this.password});
+      this.epersonService.patch(this.currentUser, [operation]).subscribe((response: RestResponse) => {
+        if (response.isSuccessful) {
+          this.notificationsService.success(
+            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.title'),
+            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.content')
+          );
+        } else {
+          this.notificationsService.error(
+            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.title'), (response as ErrorResponse).errorMessage
+          );
+        }
+      });
+    }
+    return passEntered;
+  }
+
+  /**
+   * Set the password value based on the value emitted from the security form
+   * @param $event
+   */
+  setPasswordValue($event: string) {
+    this.password = $event;
+  }
+
+  /**
+   * Submit of the security form that triggers the updateProfile method
+   */
+  submit() {
+    this.updateProfile();
+  }
 }
diff --git a/src/app/profile-page/profile-page.module.ts b/src/app/profile-page/profile-page.module.ts
index f40c125ff8..54b59c97ce 100644
--- a/src/app/profile-page/profile-page.module.ts
+++ b/src/app/profile-page/profile-page.module.ts
@@ -12,6 +12,9 @@ import { ProfilePageSecurityFormComponent } from './profile-page-security-form/p
     CommonModule,
     SharedModule
   ],
+  exports: [
+    ProfilePageSecurityFormComponent
+  ],
   declarations: [
     ProfilePageComponent,
     ProfilePageMetadataFormComponent,
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
new file mode 100644
index 0000000000..e47eedb6ae
--- /dev/null
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -0,0 +1,36 @@
+<div class="container">
+    <h2>{{MESSAGE_PREFIX + '.header'|translate}}</h2>
+    <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
+
+    <form [class]="'ng-invalid'" [formGroup]="form" (ngSubmit)="register()">
+
+        <div class="form-group">
+            <div class="row">
+                <div class="col-12">
+                    <label class="font-weight-bold"
+                           for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
+                    <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
+                           type="text" id="email" formControlName="email"/>
+                    <div *ngIf="email.invalid && (email.dirty || email.touched)"
+                         class="invalid-feedback show-feedback">
+                    <span *ngIf="email.errors && email.errors.required">
+                        {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
+                    </span>
+                    <span *ngIf="email.errors && email.errors.pattern">
+                        {{ MESSAGE_PREFIX + '.email.error.pattern' | translate }}
+                    </span>
+                    </div>
+                </div>
+                <div class="col-12">
+                    {{MESSAGE_PREFIX + '.email.hint' |translate}}
+                </div>
+
+            </div>
+
+        </div>
+    </form>
+    
+    <button class="btn btn-primary"
+            [disabled]="form.invalid"
+            (click)="register()">{{MESSAGE_PREFIX + '.submit'| translate}}</button>
+</div>
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
new file mode 100644
index 0000000000..8faaa4021d
--- /dev/null
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -0,0 +1,92 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { of as observableOf } from 'rxjs';
+import { RestResponse } from '../core/cache/response.models';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { Router } from '@angular/router';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { By } from '@angular/platform-browser';
+import { RouterStub } from '../shared/testing/router.stub';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { RegisterEmailFormComponent } from './register-email-form.component';
+
+describe('RegisterEmailComponent', () => {
+
+  let comp: RegisterEmailFormComponent;
+  let fixture: ComponentFixture<RegisterEmailFormComponent>;
+
+  let router;
+  let epersonRegistrationService: EpersonRegistrationService;
+  let notificationsService;
+
+  beforeEach(async(() => {
+
+    router = new RouterStub();
+    notificationsService = new NotificationsServiceStub();
+
+    epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
+      registerEmail: observableOf(new RestResponse(true, 200, 'Success'))
+    });
+
+    TestBed.configureTestingModule({
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [RegisterEmailFormComponent],
+      providers: [
+        {provide: Router, useValue: router},
+        {provide: EpersonRegistrationService, useValue: epersonRegistrationService},
+        {provide: FormBuilder, useValue: new FormBuilder()},
+        {provide: NotificationsService, useValue: notificationsService},
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RegisterEmailFormComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+  describe('init', () => {
+    it('should initialise the form', () => {
+      const elem = fixture.debugElement.queryAll(By.css('input#email'))[0].nativeElement;
+      expect(elem).toBeDefined();
+    });
+  });
+  describe('email validation', () => {
+    it('should be invalid when no email is present', () => {
+      expect(comp.form.invalid).toBeTrue();
+    });
+    it('should be invalid when no valid email is present', () => {
+      comp.form.patchValue({email: 'invalid'});
+      expect(comp.form.invalid).toBeTrue();
+    });
+    it('should be valid when a valid email is present', () => {
+      comp.form.patchValue({email: 'valid@email.org'});
+      expect(comp.form.invalid).toBeFalse();
+    });
+  });
+  describe('register', () => {
+    it('should send a registration to the service and on success display a message and return to home', () => {
+      comp.form.patchValue({email: 'valid@email.org'});
+
+      comp.register();
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org');
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(router.navigate).toHaveBeenCalledWith(['/home']);
+    });
+    it('should send a registration to the service and on error display a message', () => {
+      (epersonRegistrationService.registerEmail as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 400, 'Bad Request')));
+
+      comp.form.patchValue({email: 'valid@email.org'});
+
+      comp.register();
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org');
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(router.navigate).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
new file mode 100644
index 0000000000..59fe3791e0
--- /dev/null
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -0,0 +1,73 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { RestResponse } from '../core/cache/response.models';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { Router } from '@angular/router';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+
+@Component({
+  selector: 'ds-register-email-form',
+  templateUrl: './register-email-form.component.html'
+})
+/**
+ * Component responsible to render an email registration form.
+ */
+export class RegisterEmailFormComponent implements OnInit {
+
+  /**
+   * The form containing the mail address
+   */
+  form: FormGroup;
+
+  /**
+   * The message prefix
+   */
+  @Input()
+  MESSAGE_PREFIX: string;
+
+  constructor(
+    private epersonRegistrationService: EpersonRegistrationService,
+    private notificationService: NotificationsService,
+    private translateService: TranslateService,
+    private router: Router,
+    private formBuilder: FormBuilder
+  ) {
+
+  }
+
+  ngOnInit(): void {
+    this.form = this.formBuilder.group({
+      email: new FormControl('', {
+        validators: [Validators.required,
+          Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')
+        ],
+      })
+    });
+
+  }
+
+  /**
+   * Register an email address
+   */
+  register() {
+    if (!this.form.invalid) {
+      this.epersonRegistrationService.registerEmail(this.email.value).subscribe((response: RestResponse) => {
+          if (response.isSuccessful) {
+            this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`),
+              this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value}));
+            this.router.navigate(['/home']);
+          } else {
+            this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`),
+              this.translateService.get(`${this.MESSAGE_PREFIX}.error.content`, {email: this.email.value}));
+          }
+        }
+      );
+    }
+  }
+
+  get email() {
+    return this.form.get('email');
+  }
+
+}
diff --git a/src/app/register-email-form/register-email-form.module.ts b/src/app/register-email-form/register-email-form.module.ts
new file mode 100644
index 0000000000..a5fe0899a9
--- /dev/null
+++ b/src/app/register-email-form/register-email-form.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared/shared.module';
+import { RegisterEmailFormComponent } from './register-email-form.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+  ],
+  declarations: [
+    RegisterEmailFormComponent,
+  ],
+  providers: [],
+  exports: [
+    RegisterEmailFormComponent,
+  ],
+  entryComponents: []
+})
+
+/**
+ * The module that contains the components related to the email registration
+ */
+export class RegisterEmailFormModule {
+
+}
diff --git a/src/app/register-email-form/registration.resolver.spec.ts b/src/app/register-email-form/registration.resolver.spec.ts
new file mode 100644
index 0000000000..8feef919a7
--- /dev/null
+++ b/src/app/register-email-form/registration.resolver.spec.ts
@@ -0,0 +1,33 @@
+import { RegistrationResolver } from './registration.resolver';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { of as observableOf } from 'rxjs';
+import { Registration } from '../core/shared/registration.model';
+import { first } from 'rxjs/operators';
+
+describe('RegistrationResolver', () => {
+  let resolver: RegistrationResolver;
+  let epersonRegistrationService: EpersonRegistrationService;
+
+  const token = 'test-token';
+  const registration = Object.assign(new Registration(), {email: 'test@email.org', token: token, user:'user-uuid'});
+
+  beforeEach(() => {
+    epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
+      searchByToken: observableOf(registration)
+    });
+    resolver = new RegistrationResolver(epersonRegistrationService);
+  });
+  describe('resolve', () => {
+    it('should resolve a registration based on the token', () => {
+      resolver.resolve({params: {token: token}} as any, undefined)
+        .pipe(first())
+        .subscribe(
+          (resolved) => {
+            expect(resolved.token).toEqual(token);
+            expect(resolved.email).toEqual('test@email.org');
+            expect(resolved.user).toEqual('user-uuid');
+          }
+        );
+    });
+  });
+});
diff --git a/src/app/register-email-form/registration.resolver.ts b/src/app/register-email-form/registration.resolver.ts
new file mode 100644
index 0000000000..64ca2ba9f4
--- /dev/null
+++ b/src/app/register-email-form/registration.resolver.ts
@@ -0,0 +1,20 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { Registration } from '../core/shared/registration.model';
+import { Observable } from 'rxjs';
+
+@Injectable()
+/**
+ * Resolver to resolve a Registration object based on the provided token
+ */
+export class RegistrationResolver implements Resolve<Registration> {
+
+  constructor(private epersonRegistrationService: EpersonRegistrationService) {
+  }
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Registration> {
+    const token = route.params.token;
+    return this.epersonRegistrationService.searchByToken(token);
+  }
+}
diff --git a/src/app/register-page/create-profile/confirmed.validator.spec.ts b/src/app/register-page/create-profile/confirmed.validator.spec.ts
new file mode 100644
index 0000000000..9bbbda9f29
--- /dev/null
+++ b/src/app/register-page/create-profile/confirmed.validator.spec.ts
@@ -0,0 +1,32 @@
+import { FormBuilder, FormControl } from '@angular/forms';
+import { async, fakeAsync } from '@angular/core/testing';
+import { ConfirmedValidator } from './confirmed.validator';
+
+describe('ConfirmedValidator', () => {
+  let passwordForm;
+
+  beforeEach(async(() => {
+
+    passwordForm = (new FormBuilder()).group({
+      password: new FormControl('', {}),
+      confirmPassword: new FormControl('', {})
+    }, {
+      validator: ConfirmedValidator('password', 'confirmPassword')
+    });
+  }));
+
+  it('should validate that the password and confirm password match', fakeAsync(() => {
+
+    passwordForm.get('password').patchValue('test-password');
+    passwordForm.get('confirmPassword').patchValue('test-password-mismatch');
+
+    expect(passwordForm.valid).toBe(false);
+  }));
+
+  it('should invalidate that the password and confirm password match', fakeAsync(() => {
+    passwordForm.get('password').patchValue('test-password');
+    passwordForm.get('confirmPassword').patchValue('test-password');
+
+    expect(passwordForm.valid).toBe(true);
+  }));
+});
diff --git a/src/app/register-page/create-profile/confirmed.validator.ts b/src/app/register-page/create-profile/confirmed.validator.ts
new file mode 100644
index 0000000000..30f4f01701
--- /dev/null
+++ b/src/app/register-page/create-profile/confirmed.validator.ts
@@ -0,0 +1,19 @@
+import { FormGroup } from '@angular/forms';
+
+/**
+ * Validator used to confirm that the password and confirmed password value are the same
+ */
+export function ConfirmedValidator(controlName: string, matchingControlName: string) {
+  return (formGroup: FormGroup) => {
+    const control = formGroup.controls[controlName];
+    const matchingControl = formGroup.controls[matchingControlName];
+    if (matchingControl.errors && !matchingControl.errors.confirmedValidator) {
+      return;
+    }
+    if (control.value !== matchingControl.value) {
+      matchingControl.setErrors({confirmedValidator: true});
+    } else {
+      matchingControl.setErrors(null);
+    }
+  };
+}
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
new file mode 100644
index 0000000000..cfd6e7ab16
--- /dev/null
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -0,0 +1,91 @@
+<div class="container">
+    <h3 class="mb-4">{{'register-page.create-profile.header' | translate}}</h3>
+    <div class="card mb-4">
+        <div class="card-header">{{'register-page.create-profile.identification.header' | translate}}</div>
+        <div class="card-body">
+            <div class="row">
+                <div class="col-12">
+                    <label class="font-weight-bold"
+                           for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
+                    <span id="email">{{(registration$ |async).email}}</span></div>
+            </div>
+            <form [class]="'ng-invalid'" [formGroup]="userInfoForm" (ngSubmit)="submitEperson()">
+
+                <div class="form-group">
+                    <div class="row">
+                        <div class="col-12">
+                            <label for="firstName">{{'register-page.create-profile.identification.first-name' | translate}}</label>
+                            <input [className]="(firstName.invalid) && (firstName.dirty || firstName.touched) ? 'form-control is-invalid' :'form-control'"
+                                   type="text" id="firstName" formControlName="firstName"/>
+                            <div *ngIf="firstName.invalid && (firstName.dirty || firstName.touched)"
+                                 class="invalid-feedback show-feedback">
+                    <span *ngIf="firstName.errors && firstName.errors.required">
+                        {{ 'register-page.create-profile.identification.first-name.error' | translate }}
+                    </span>
+                            </div>
+                        </div>
+
+                    </div>
+                    <div class="row">
+                        <div class="col-12">
+                            <label
+                                    for="lastName">{{'register-page.create-profile.identification.last-name' | translate}}</label>
+                            <input
+                                    [className]="(lastName.invalid) && (lastName.dirty || lastName.touched) ? 'form-control is-invalid' :'form-control'"
+                                    id="lastName" formControlName="lastName">
+                            <div *ngIf="lastName.invalid && (lastName.dirty || lastName.touched)"
+                                 class="invalid-feedback show-feedback">
+                    <span *ngIf="lastName.errors && lastName.errors.required">
+                        {{ 'register-page.create-profile.identification.last-name.error' | translate }}
+                    </span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-12">
+                            <label
+                                    for="contactPhone">{{'register-page.create-profile.identification.contact' | translate}}</label>
+                            <input class="form-control" id="contactPhone" formControlName="contactPhone">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-12">
+                            <label
+                                    for="language">{{'register-page.create-profile.identification.language' |translate}}</label>
+
+                            <select id="language" formControlName="language" class="form-control">
+                                <option [value]="''"></option>
+                                <option *ngFor="let lang of activeLangs" [value]="lang.code">{{lang.label}}</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <div class="card mb-4">
+        <div class="card-header">{{'register-page.create-profile.security.header' | translate}}</div>
+        <div class="card-body">
+
+            <ds-profile-page-security-form
+                    [passwordCanBeEmpty]="false"
+                    [FORM_PREFIX]="'register-page.create-profile.security.'"
+                    (isInvalid)="setInValid($event)"
+                    (passwordValue)="setPasswordValue($event)"
+            ></ds-profile-page-security-form>
+        </div>
+    </div>
+
+
+    <div class="row">
+        <div class="col-12">
+            <button
+                    [disabled]="isInValidPassword || userInfoForm.invalid"
+                    class="btn btn-default btn-primary"
+                    (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
+        </div>
+    </div>
+
+
+</div>
diff --git a/src/app/register-page/create-profile/create-profile.component.spec.ts b/src/app/register-page/create-profile/create-profile.component.spec.ts
new file mode 100644
index 0000000000..a435e1143e
--- /dev/null
+++ b/src/app/register-page/create-profile/create-profile.component.spec.ts
@@ -0,0 +1,184 @@
+import { CreateProfileComponent } from './create-profile.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { Registration } from '../../core/shared/registration.model';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { of as observableOf } from 'rxjs';
+import { RestResponse } from '../../core/cache/response.models';
+import { By } from '@angular/platform-browser';
+import { CoreState } from '../../core/core.reducers';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+
+describe('CreateProfileComponent', () => {
+  let comp: CreateProfileComponent;
+  let fixture: ComponentFixture<CreateProfileComponent>;
+
+  let router;
+  let route;
+  let ePersonDataService: EPersonDataService;
+  let notificationsService;
+  let store: Store<CoreState>;
+
+  const registration = Object.assign(new Registration(), {email: 'test@email.org', token: 'test-token'});
+
+  const values = {
+    metadata: {
+      'eperson.firstname': [
+        {
+          value: 'First'
+        }
+      ],
+      'eperson.lastname': [
+        {
+          value: 'Last'
+        },
+      ],
+      'eperson.phone': [
+        {
+          value: 'Phone'
+        }
+      ],
+      'eperson.language': [
+        {
+          value: 'en'
+        }
+      ]
+    },
+    email: 'test@email.org',
+    password: 'password',
+    canLogIn: true,
+    requireCertificate: false
+  };
+  const eperson = Object.assign(new EPerson(), values);
+
+  beforeEach(async(() => {
+    route = {data: observableOf({registration: registration})};
+    router = new RouterStub();
+    notificationsService = new NotificationsServiceStub();
+
+    ePersonDataService = jasmine.createSpyObj('ePersonDataService', {
+      createEPersonForToken: observableOf(new RestResponse(true, 200, 'Success'))
+    });
+
+    store = jasmine.createSpyObj('store', {
+      dispatch: {},
+    });
+
+    TestBed.configureTestingModule({
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [CreateProfileComponent],
+      providers: [
+        {provide: Router, useValue: router},
+        {provide: ActivatedRoute, useValue: route},
+        {provide: Store, useValue: store},
+        {provide: EPersonDataService, useValue: ePersonDataService},
+        {provide: FormBuilder, useValue: new FormBuilder()},
+        {provide: NotificationsService, useValue: notificationsService},
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CreateProfileComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+
+  describe('init', () => {
+    it('should initialise mail address', () => {
+      const elem = fixture.debugElement.queryAll(By.css('span#email'))[0].nativeElement;
+      expect(elem.innerHTML).toContain('test@email.org');
+    });
+    it('should initialise the form', () => {
+      const firstName = fixture.debugElement.queryAll(By.css('input#firstName'))[0].nativeElement;
+      const lastName = fixture.debugElement.queryAll(By.css('input#lastName'))[0].nativeElement;
+      const contactPhone = fixture.debugElement.queryAll(By.css('input#contactPhone'))[0].nativeElement;
+      const language = fixture.debugElement.queryAll(By.css('select#language'))[0].nativeElement;
+
+      expect(firstName).toBeDefined();
+      expect(lastName).toBeDefined();
+      expect(contactPhone).toBeDefined();
+      expect(language).toBeDefined();
+    });
+  });
+
+  describe('submitEperson', () => {
+
+    it('should submit an eperson for creation and log in on success', () => {
+      comp.firstName.patchValue('First');
+      comp.lastName.patchValue('Last');
+      comp.contactPhone.patchValue('Phone');
+      comp.language.patchValue('en');
+      comp.password = 'password';
+      comp.isInValidPassword = false;
+
+      comp.submitEperson();
+
+      expect(ePersonDataService.createEPersonForToken).toHaveBeenCalledWith(eperson, 'test-token');
+      expect(store.dispatch).toHaveBeenCalledWith(new AuthenticateAction('test@email.org', 'password'));
+      expect(router.navigate).toHaveBeenCalledWith(['/home']);
+      expect(notificationsService.success).toHaveBeenCalled();
+    });
+
+    it('should submit an eperson for creation and stay on page on error', () => {
+
+      (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 500, 'Error')));
+
+      comp.firstName.patchValue('First');
+      comp.lastName.patchValue('Last');
+      comp.contactPhone.patchValue('Phone');
+      comp.language.patchValue('en');
+      comp.password = 'password';
+      comp.isInValidPassword = false;
+
+      comp.submitEperson();
+
+      expect(ePersonDataService.createEPersonForToken).toHaveBeenCalledWith(eperson, 'test-token');
+      expect(store.dispatch).not.toHaveBeenCalled();
+      expect(router.navigate).not.toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+    });
+    it('should submit not create an eperson when the user info form is invalid', () => {
+
+      (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 500, 'Error')));
+
+      comp.firstName.patchValue('');
+      comp.lastName.patchValue('Last');
+      comp.contactPhone.patchValue('Phone');
+      comp.language.patchValue('en');
+      comp.password = 'password';
+      comp.isInValidPassword = false;
+
+      comp.submitEperson();
+
+      expect(ePersonDataService.createEPersonForToken).not.toHaveBeenCalled();
+    });
+    it('should submit not create an eperson when the password is invalid', () => {
+
+      (ePersonDataService.createEPersonForToken as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 500, 'Error')));
+
+      comp.firstName.patchValue('First');
+      comp.lastName.patchValue('Last');
+      comp.contactPhone.patchValue('Phone');
+      comp.language.patchValue('en');
+      comp.password = 'password';
+      comp.isInValidPassword = true;
+
+      comp.submitEperson();
+
+      expect(ePersonDataService.createEPersonForToken).not.toHaveBeenCalled();
+    });
+
+  });
+});
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
new file mode 100644
index 0000000000..2755a17739
--- /dev/null
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -0,0 +1,155 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { map } from 'rxjs/operators';
+import { Registration } from '../../core/shared/registration.model';
+import { Observable } from 'rxjs';
+import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { LangConfig } from '../../../config/lang-config.interface';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core/core.reducers';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { environment } from '../../../environments/environment';
+import { isEmpty } from '../../shared/empty.util';
+
+/**
+ * Component that renders the create profile page to be used by a user registering through a token
+ */
+@Component({
+  selector: 'ds-create-profile',
+  templateUrl: './create-profile.component.html'
+})
+export class CreateProfileComponent implements OnInit {
+  registration$: Observable<Registration>;
+
+  email: string;
+  token: string;
+
+  isInValidPassword = true;
+  password: string;
+
+  userInfoForm: FormGroup;
+  activeLangs: LangConfig[];
+
+  constructor(
+    private translateService: TranslateService,
+    private ePersonDataService: EPersonDataService,
+    private store: Store<CoreState>,
+    private router: Router,
+    private route: ActivatedRoute,
+    private formBuilder: FormBuilder,
+    private notificationsService: NotificationsService
+  ) {
+
+  }
+
+  ngOnInit(): void {
+    this.registration$ = this.route.data.pipe(
+      map((data) => data.registration as Registration),
+    );
+    this.registration$.subscribe((registration: Registration) => {
+      this.email = registration.email;
+      this.token = registration.token;
+    });
+    this.activeLangs = environment.languages.filter((MyLangConfig) => MyLangConfig.active === true);
+
+    this.userInfoForm = this.formBuilder.group({
+      firstName: new FormControl('', {
+        validators: [Validators.required],
+      }),
+      lastName: new FormControl('', {
+        validators: [Validators.required],
+      }),
+      contactPhone: new FormControl(''),
+      language: new FormControl(''),
+    });
+
+  }
+
+  /**
+   * Sets the validity of the password based on a value emitted from the form
+   * @param $event
+   */
+  setInValid($event: boolean) {
+    this.isInValidPassword = $event || isEmpty(this.password);
+  }
+
+  /**
+   * Sets the value of the password based on a value emitted from the form
+   * @param $event
+   */
+  setPasswordValue($event: string) {
+    this.password = $event;
+    this.isInValidPassword = this.isInValidPassword || isEmpty(this.password);
+  }
+
+  get firstName() {
+    return this.userInfoForm.get('firstName');
+  }
+
+  get lastName() {
+    return this.userInfoForm.get('lastName');
+  }
+
+  get contactPhone() {
+    return this.userInfoForm.get('contactPhone');
+  }
+
+  get language() {
+    return this.userInfoForm.get('language');
+  }
+
+  /**
+   * Submits the eperson to the service to be created.
+   * The submission will not be made when the form or the password is not valid.
+   */
+  submitEperson() {
+    if (!(this.userInfoForm.invalid || this.isInValidPassword)) {
+      const values = {
+        metadata: {
+          'eperson.firstname': [
+            {
+              value: this.firstName.value
+            }
+          ],
+          'eperson.lastname': [
+            {
+              value: this.lastName.value
+            },
+          ],
+          'eperson.phone': [
+            {
+              value: this.contactPhone.value
+            }
+          ],
+          'eperson.language': [
+            {
+              value: this.language.value
+            }
+          ]
+        },
+        email: this.email,
+        password: this.password,
+        canLogIn: true,
+        requireCertificate: false
+      };
+
+      const eperson = Object.assign(new EPerson(), values);
+      this.ePersonDataService.createEPersonForToken(eperson, this.token).subscribe((response) => {
+        if (response.isSuccessful) {
+          this.notificationsService.success(this.translateService.get('register-page.create-profile.submit.success.head'),
+            this.translateService.get('register-page.create-profile.submit.success.content'));
+          this.store.dispatch(new AuthenticateAction(this.email, this.password));
+          this.router.navigate(['/home']);
+        } else {
+          this.notificationsService.error(this.translateService.get('register-page.create-profile.submit.error.head'),
+            this.translateService.get('register-page.create-profile.submit.error.content'));
+        }
+      });
+    }
+  }
+
+}
diff --git a/src/app/register-page/register-email/register-email.component.html b/src/app/register-page/register-email/register-email.component.html
new file mode 100644
index 0000000000..a60dc4c31e
--- /dev/null
+++ b/src/app/register-page/register-email/register-email.component.html
@@ -0,0 +1,3 @@
+<ds-register-email-form
+        [MESSAGE_PREFIX]="'register-page.registration'">
+</ds-register-email-form>
diff --git a/src/app/register-page/register-email/register-email.component.spec.ts b/src/app/register-page/register-email/register-email.component.spec.ts
new file mode 100644
index 0000000000..74bd247d74
--- /dev/null
+++ b/src/app/register-page/register-email/register-email.component.spec.ts
@@ -0,0 +1,30 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { TranslateModule } from '@ngx-translate/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { RegisterEmailComponent } from './register-email.component';
+
+describe('RegisterEmailComponent', () => {
+
+  let comp: RegisterEmailComponent;
+  let fixture: ComponentFixture<RegisterEmailComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule],
+      declarations: [RegisterEmailComponent],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+    }).compileComponents();
+  }));
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RegisterEmailComponent);
+    comp = fixture.componentInstance;
+
+    fixture.detectChanges();
+  });
+
+  it('should be defined', () => {
+    expect(comp).toBeDefined();
+  });
+});
diff --git a/src/app/register-page/register-email/register-email.component.ts b/src/app/register-page/register-email/register-email.component.ts
new file mode 100644
index 0000000000..ac221c109a
--- /dev/null
+++ b/src/app/register-page/register-email/register-email.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-register-email',
+  templateUrl: './register-email.component.html'
+})
+/**
+ * Component responsible the email registration step when registering as a new user
+ */
+export class RegisterEmailComponent {
+
+}
diff --git a/src/app/register-page/register-page-routing.module.ts b/src/app/register-page/register-page-routing.module.ts
new file mode 100644
index 0000000000..c7cceeaaf4
--- /dev/null
+++ b/src/app/register-page/register-page-routing.module.ts
@@ -0,0 +1,32 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { RegisterEmailComponent } from './register-email/register-email.component';
+import { CreateProfileComponent } from './create-profile/create-profile.component';
+import { ItemPageResolver } from '../+item-page/item-page.resolver';
+import { RegistrationResolver } from '../register-email-form/registration.resolver';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        component: RegisterEmailComponent,
+        data: {title: 'register-email.title'},
+      },
+      {
+        path: ':token',
+        component: CreateProfileComponent,
+        resolve: {registration: RegistrationResolver}
+      }
+    ])
+  ],
+  providers: [
+    RegistrationResolver,
+    ItemPageResolver
+  ]
+})
+/**
+ * Module related to the navigation to components used to register a new user
+ */
+export class RegisterPageRoutingModule {
+}
diff --git a/src/app/register-page/register-page.module.ts b/src/app/register-page/register-page.module.ts
new file mode 100644
index 0000000000..b29d2ecaaf
--- /dev/null
+++ b/src/app/register-page/register-page.module.ts
@@ -0,0 +1,31 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../shared/shared.module';
+import { RegisterPageRoutingModule } from './register-page-routing.module';
+import { RegisterEmailComponent } from './register-email/register-email.component';
+import { CreateProfileComponent } from './create-profile/create-profile.component';
+import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
+import { ProfilePageModule } from '../profile-page/profile-page.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    RegisterPageRoutingModule,
+    RegisterEmailFormModule,
+    ProfilePageModule,
+  ],
+  declarations: [
+    RegisterEmailComponent,
+    CreateProfileComponent
+  ],
+  providers: [],
+  entryComponents: []
+})
+
+/**
+ * Module related to components used to register a new user
+ */
+export class RegisterPageModule {
+
+}
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
new file mode 100644
index 0000000000..36269294c1
--- /dev/null
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -0,0 +1,43 @@
+<div class="form-group w-100 pr-2 pl-2">
+  <input *ngIf="searchField"
+          type="search"
+          class="form-control w-100"
+          (click)="$event.stopPropagation();"
+          placeholder="{{ 'submission.sections.general.search-collection' | translate }}"
+          [formControl]="searchField"
+          #searchFieldEl>
+</div>
+<div class="dropdown-divider"></div>
+<div
+    class="scrollable-menu"
+    aria-labelledby="dropdownMenuButton"
+    (scroll)="onScroll($event)">
+  <div
+    infiniteScroll
+    [infiniteScrollDistance]="2"
+    [infiniteScrollThrottle]="300"
+    [infiniteScrollUpDistance]="1.5"
+    [infiniteScrollContainer]="'.scrollable-menu'"
+    [fromRoot]="true"
+    (scrolled)="onScrollDown()">
+    <button class="dropdown-item disabled" *ngIf="searchListCollection?.length == 0 && !(isLoadingList | async)">
+      {{'submission.sections.general.no-collection' | translate}}
+    </button>
+    <button
+          *ngFor="let listItem of searchListCollection"
+          class="dropdown-item collection-item"
+          title="{{ listItem.collection.name }}"
+          (click)="onSelect(listItem)">
+      <ul class="list-unstyled mb-0">
+        <li class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities">
+          {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
+        </li>
+        <li class="list-item text-truncate text-primary font-weight-bold">{{ listItem.collection.name}}</li>
+      </ul>
+    </button>
+    <button class="dropdown-item disabled" *ngIf="(isLoadingList | async)" >
+      <ds-loading message="{{'loading.default' | translate}}">
+      </ds-loading>
+    </button>
+  </div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.scss b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
new file mode 100644
index 0000000000..deecc39510
--- /dev/null
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.scss
@@ -0,0 +1,15 @@
+.scrollable-menu {
+  height: auto;
+  max-height: $dropdown-menu-max-height;
+  overflow-x: hidden;
+}
+
+.collection-item {
+  border-bottom: $dropdown-border-width solid $dropdown-border-color;
+}
+
+#collectionControlsDropdownMenu {
+  outline: 0;
+  left: 0 !important;
+  box-shadow: $btn-focus-box-shadow;
+}
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
new file mode 100644
index 0000000000..8530be665e
--- /dev/null
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
@@ -0,0 +1,241 @@
+import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+
+import { CollectionDropdownComponent } from './collection-dropdown.component';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
+import { Observable, of } from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { PaginatedList } from 'src/app/core/data/paginated-list';
+import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { PageInfo } from 'src/app/core/shared/page-info.model';
+import { Collection } from '../../core/shared/collection.model';
+import { NO_ERRORS_SCHEMA, ChangeDetectorRef, ElementRef } from '@angular/core';
+import { CollectionDataService } from 'src/app/core/data/collection-data.service';
+import { FindListOptions } from 'src/app/core/data/request.models';
+import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { TestScheduler } from 'rxjs/testing';
+import { By } from '@angular/platform-browser';
+import { Community } from 'src/app/core/shared/community.model';
+
+const community: Community = Object.assign(new Community(), {
+  id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+  uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+  name: 'Community 1'
+});
+
+const collections: Collection[] = [
+  Object.assign(new Collection(), {
+    id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+    name: 'Collection 1',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 1'
+      }],
+    parentCommunity: of(
+      new RemoteData(false, false, true, undefined, community, 200)
+    )
+  }),
+  Object.assign(new Collection(), {
+    id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+    name: 'Collection 2',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 2'
+      }],
+    parentCommunity: of(
+      new RemoteData(false, false, true, undefined, community, 200)
+    )
+  }),
+  Object.assign(new Collection(), {
+    id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+    name: 'Collection 3',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 3'
+      }],
+    parentCommunity: of(
+      new RemoteData(false, false, true, undefined, community, 200)
+    )
+  }),
+  Object.assign(new Collection(), {
+    id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
+    name: 'Collection 4',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 4'
+      }],
+    parentCommunity: of(
+      new RemoteData(false, false, true, undefined, community, 200)
+    )
+  }),
+  Object.assign(new Collection(), {
+    id: 'a5159760-f362-4659-9e81-e3253ad91ede',
+    name: 'Collection 5',
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 5'
+      }],
+    parentCommunity: of(
+      new RemoteData(false, false, true, undefined, community, 200)
+    )
+  })
+];
+
+const listElementMock = {
+    communities: [
+      {
+        id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+        name: 'Community 1'
+      }
+    ],
+    collection: {
+      id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+      uuid: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+      name: 'Collection 3'
+    }
+  };
+
+// tslint:disable-next-line: max-classes-per-file
+class CollectionDataServiceMock {
+  getAuthorizedCollection(query: string, options: FindListOptions = {}, ...linksToFollow: Array<FollowLinkConfig<Collection>>): Observable<RemoteData<PaginatedList<Collection>>> {
+    return of(
+        createSuccessfulRemoteDataObject(
+          new PaginatedList(new PageInfo(), collections)
+        )
+    );
+  }
+}
+
+describe('CollectionDropdownComponent', () => {
+  let component: CollectionDropdownComponent;
+  let fixture: ComponentFixture<CollectionDropdownComponent>;
+  let scheduler: TestScheduler;
+  const searchedCollection = 'TEXT';
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })
+      ],
+      declarations: [ CollectionDropdownComponent ],
+      providers: [
+        {provide: CollectionDataService, useClass: CollectionDataServiceMock},
+        {provide: ChangeDetectorRef, useValue: {}},
+        {provide: ElementRef, userValue: {}}
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+    fixture = TestBed.createComponent(CollectionDropdownComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should populate collections list with five items', () => {
+    const elements = fixture.debugElement.queryAll(By.css('.collection-item'));
+    expect(elements.length).toEqual(5);
+  });
+
+  it('should trigger onSelect method when select a new collection from list', fakeAsync(() => {
+    spyOn(component, 'onSelect');
+    const collectionItem = fixture.debugElement.query(By.css('.collection-item:nth-child(2)'));
+    collectionItem.triggerEventHandler('click', null);
+    fixture.detectChanges();
+    tick();
+    fixture.whenStable().then(() => {
+      expect(component.onSelect).toHaveBeenCalled();
+    });
+  }));
+
+  it('should init component with collection list', fakeAsync(() => {
+    spyOn(component.subs, 'push').and.callThrough();
+    spyOn(component, 'resetPagination').and.callThrough();
+    spyOn(component, 'populateCollectionList').and.callThrough();
+    component.ngOnInit();
+    tick();
+    fixture.detectChanges();
+
+    fixture.whenStable().then(() => {
+      expect(component.subs.push).toHaveBeenCalled();
+      expect(component.resetPagination).toHaveBeenCalled();
+      expect(component.populateCollectionList).toHaveBeenCalled();
+    });
+  }));
+
+  it('should emit collectionChange event when selecting a new collection', () => {
+    spyOn(component.selectionChange, 'emit').and.callThrough();
+    component.ngOnInit();
+    component.onSelect(listElementMock as any);
+    fixture.detectChanges();
+
+    expect(component.selectionChange.emit).toHaveBeenCalledWith(listElementMock as any);
+  });
+
+  it('should reset collections list after reset of searchField', fakeAsync(() => {
+    spyOn(component.subs, 'push').and.callThrough();
+    spyOn(component, 'reset').and.callThrough();
+    spyOn(component.searchField, 'setValue').and.callThrough();
+    spyOn(component, 'resetPagination').and.callThrough();
+    spyOn(component, 'populateCollectionList').and.callThrough();
+    component.reset();
+    const input = fixture.debugElement.query(By.css('input.form-control'));
+    const el = input.nativeElement;
+    el.value = searchedCollection;
+    el.dispatchEvent(new Event('input'));
+    fixture.detectChanges();
+    tick(500);
+
+    fixture.whenStable().then(() => {
+      expect(component.reset).toHaveBeenCalled();
+      expect(component.searchField.setValue).toHaveBeenCalledWith('');
+      expect(component.resetPagination).toHaveBeenCalled();
+      expect(component.currentQuery).toEqual('');
+      expect(component.populateCollectionList).toHaveBeenCalledWith(component.currentQuery, component.currentPage);
+      expect(component.searchListCollection).toEqual(collections as any);
+      expect(component.subs.push).toHaveBeenCalled();
+    });
+  }));
+
+  it('should reset searchField when dropdown menu has been closed', () => {
+    spyOn(component.searchField, 'setValue').and.callThrough();
+    component.reset();
+
+    expect(component.searchField.setValue).toHaveBeenCalled();
+  });
+
+  it('should change loader status', () => {
+    spyOn(component.isLoadingList, 'next').and.callThrough();
+    component.hideShowLoader(true);
+
+    expect(component.isLoadingList.next).toHaveBeenCalledWith(true);
+  });
+
+  it('reset pagination fields', () => {
+    component.resetPagination();
+
+    expect(component.currentPage).toEqual(1);
+    expect(component.currentQuery).toEqual('');
+    expect(component.hasNextPage).toEqual(true);
+    expect(component.searchListCollection).toEqual([]);
+  });
+});
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
new file mode 100644
index 0000000000..05105d74a7
--- /dev/null
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -0,0 +1,236 @@
+import { Component, OnInit, HostListener, ChangeDetectorRef, OnDestroy, Output, EventEmitter, ElementRef } from '@angular/core';
+import { FormControl } from '@angular/forms';
+import { Observable, Subscription, BehaviorSubject } from 'rxjs';
+import { hasValue } from '../empty.util';
+import { map, mergeMap, startWith, debounceTime, distinctUntilChanged, switchMap, reduce } from 'rxjs/operators';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { FindListOptions } from 'src/app/core/data/request.models';
+import { PaginatedList } from 'src/app/core/data/paginated-list';
+import { Community } from 'src/app/core/shared/community.model';
+import { CollectionDataService } from 'src/app/core/data/collection-data.service';
+import { Collection } from '../../core/shared/collection.model';
+import { followLink } from '../utils/follow-link-config.model';
+import { getFirstSucceededRemoteDataPayload, getSucceededRemoteWithNotEmptyData } from '../../core/shared/operators';
+
+/**
+ * An interface to represent a collection entry
+ */
+interface CollectionListEntryItem {
+  id: string;
+  uuid: string;
+  name: string;
+}
+
+/**
+ * An interface to represent an entry in the collection list
+ */
+interface CollectionListEntry {
+  communities: CollectionListEntryItem[],
+  collection: CollectionListEntryItem
+}
+
+@Component({
+  selector: 'ds-collection-dropdown',
+  templateUrl: './collection-dropdown.component.html',
+  styleUrls: ['./collection-dropdown.component.scss']
+})
+export class CollectionDropdownComponent implements OnInit, OnDestroy {
+
+  /**
+   * The search form control
+   * @type {FormControl}
+   */
+  public searchField: FormControl = new FormControl();
+
+  /**
+   * The collection list obtained from a search
+   * @type {Observable<CollectionListEntry[]>}
+   */
+  public searchListCollection$: Observable<CollectionListEntry[]>;
+
+  /**
+   * A boolean representing if dropdown list is scrollable to the bottom
+   * @type {boolean}
+   */
+  private scrollableBottom = false;
+
+  /**
+   * A boolean representing if dropdown list is scrollable to the top
+   * @type {boolean}
+   */
+  private scrollableTop = false;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  public subs: Subscription[] = [];
+
+  /**
+   * The list of collection to render
+   */
+  searchListCollection: CollectionListEntry[] = [];
+
+  @Output() selectionChange = new EventEmitter<CollectionListEntry>();
+  /**
+   * A boolean representing if the loader is visible or not
+   */
+  isLoadingList: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  /**
+   * A numeric representig current page
+   */
+  currentPage: number;
+
+  /**
+   * A boolean representing if exist another page to render
+   */
+  hasNextPage: boolean;
+
+  /**
+   * Current seach query used to filter collection list
+   */
+  currentQuery: string;
+
+  constructor(
+    private changeDetectorRef: ChangeDetectorRef,
+    private collectionDataService: CollectionDataService,
+    private el: ElementRef
+  ) { }
+
+  /**
+   * Method called on mousewheel event, it prevent the page scroll
+   * when arriving at the top/bottom of dropdown menu
+   *
+   * @param event
+   *     mousewheel event
+   */
+  @HostListener('mousewheel', ['$event']) onMousewheel(event) {
+    if (event.wheelDelta > 0 && this.scrollableTop) {
+      event.preventDefault();
+    }
+    if (event.wheelDelta < 0 && this.scrollableBottom) {
+      event.preventDefault();
+    }
+  }
+
+  /**
+   * Initialize collection list
+   */
+  ngOnInit() {
+    this.subs.push(this.searchField.valueChanges.pipe(
+        debounceTime(500),
+        distinctUntilChanged(),
+        startWith('')
+      ).subscribe(
+        (next) => {
+          if (hasValue(next) && next !== this.currentQuery) {
+            this.resetPagination();
+            this.currentQuery = next;
+            this.populateCollectionList(this.currentQuery, this.currentPage);
+          }
+        }
+      ));
+    // Workaround for prevent the scroll of main page when this component is placed in a dialog
+    setTimeout(() => this.el.nativeElement.querySelector('input').focus(), 0);
+  }
+
+  /**
+   * Check if dropdown scrollbar is at the top or bottom of the dropdown list
+   *
+   * @param event
+   */
+  onScroll(event) {
+    this.scrollableBottom = (event.target.scrollTop + event.target.clientHeight === event.target.scrollHeight);
+    this.scrollableTop = (event.target.scrollTop === 0);
+  }
+
+  /**
+   * Method used from infitity scroll for retrive more data on scroll down
+   */
+  onScrollDown() {
+    if ( this.hasNextPage ) {
+      this.populateCollectionList(this.currentQuery, ++this.currentPage);
+    }
+  }
+
+  /**
+   * Emit a [selectionChange] event when a new collection is selected from list
+   *
+   * @param event
+   *    the selected [CollectionListEntry]
+   */
+  onSelect(event: CollectionListEntry) {
+    this.selectionChange.emit(event);
+  }
+
+  /**
+   * Method called for populate the collection list
+   * @param query text for filter the collection list
+   * @param page page number
+   */
+  populateCollectionList(query: string, page: number) {
+    this.isLoadingList.next(true);
+    // Set the pagination info
+    const findOptions: FindListOptions = {
+      elementsPerPage: 10,
+      currentPage: page
+    };
+    this.searchListCollection$ = this.collectionDataService
+      .getAuthorizedCollection(query, findOptions, followLink('parentCommunity'))
+      .pipe(
+        getSucceededRemoteWithNotEmptyData(),
+        switchMap((collections: RemoteData<PaginatedList<Collection>>) => {
+          if ( (this.searchListCollection.length + findOptions.elementsPerPage) >= collections.payload.totalElements ) {
+            this.hasNextPage = false;
+          }
+          return collections.payload.page;
+        }),
+        mergeMap((collection: Collection) => collection.parentCommunity.pipe(
+          getFirstSucceededRemoteDataPayload(),
+          map((community: Community) => ({
+            communities: [{ id: community.id, name: community.name }],
+            collection: { id: collection.id, uuid: collection.id, name: collection.name }
+          })
+        ))),
+        reduce((acc: any, value: any) => [...acc, ...value], []),
+        startWith([])
+        );
+    this.subs.push(this.searchListCollection$.subscribe(
+      (next) => { this.searchListCollection.push(...next); }, undefined,
+      () => { this.hideShowLoader(false); this.changeDetectorRef.detectChanges(); }
+    ));
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Reset search form control
+   */
+  reset() {
+    this.searchField.setValue('');
+  }
+
+  /**
+   * Reset pagination values
+   */
+  resetPagination() {
+    this.currentPage = 1;
+    this.currentQuery = '';
+    this.hasNextPage = true;
+    this.searchListCollection = [];
+  }
+
+  /**
+   * Hide/Show the collection list loader
+   * @param hideShow true for show, false otherwise
+   */
+  hideShowLoader(hideShow: boolean) {
+    this.isLoadingList.next(hideShow);
+  }
+}
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
index a1bac46f87..3fcdc280d0 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
@@ -22,6 +22,7 @@ import { NotificationsService } from '../../notifications/notifications.service'
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { VarDirective } from '../../utils/var.directive';
 import { ComColFormComponent } from './comcol-form.component';
+import { Operation } from 'fast-json-patch';
 
 describe('ComColFormComponent', () => {
   let comp: ComColFormComponent<DSpaceObject>;
@@ -40,11 +41,8 @@ describe('ComColFormComponent', () => {
     }
   };
   const dcTitle = 'dc.title';
-  const dcRandom = 'dc.random';
   const dcAbstract = 'dc.description.abstract';
 
-  const titleMD = { [dcTitle]: [{ value: 'Community Title', language: null }] };
-  const randomMD = { [dcRandom]: [{ value: 'Random metadata excluded from form', language: null }] };
   const abstractMD = { [dcAbstract]: [{ value: 'Community description', language: null }] };
   const newTitleMD = { [dcTitle]: [{ value: 'New Community Title', language: null }] };
   const formModel = [
@@ -112,33 +110,47 @@ describe('ComColFormComponent', () => {
       });
 
       it('should emit the new version of the community', () => {
-        comp.dso = Object.assign(
-          new Community(),
-          {
-            metadata: {
-              ...titleMD,
-              ...randomMD
-            }
-          }
-        );
+        comp.dso = new Community();
         comp.onSubmit();
 
+        const operations: Operation[] = [
+          {
+            op: 'replace',
+            path: '/metadata/dc.title',
+            value: {
+              value: 'New Community Title',
+              language: null,
+            },
+          },
+          {
+            op: 'replace',
+            path: '/metadata/dc.description.abstract',
+            value: {
+              value: 'Community description',
+              language: null,
+            },
+          },
+        ];
+
         expect(comp.submitForm.emit).toHaveBeenCalledWith(
           {
-            dso: Object.assign(
-              {},
-              new Community(),
-              {
+            dso: Object.assign({}, comp.dso, {
                 metadata: {
-                  ...newTitleMD,
-                  ...randomMD,
-                  ...abstractMD
+                  'dc.title': [{
+                    value: 'New Community Title',
+                    language: null,
+                  }],
+                  'dc.description.abstract': [{
+                    value: 'Community description',
+                    language: null,
+                  }],
                 },
-                type: Community.type
-              },
+                type: Community.type,
+              }
             ),
             uploader: undefined,
-            deleteLogo: false
+            deleteLogo: false,
+            operations: operations,
           }
         );
       })
@@ -164,11 +176,6 @@ describe('ComColFormComponent', () => {
       it('should emit finish', () => {
         expect(comp.finish.emit).toHaveBeenCalled();
       });
-
-      it('should remove the object\'s cache', () => {
-        expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalled();
-        expect(objectCacheStub.remove).toHaveBeenCalled();
-      });
     });
 
     describe('onUploadError', () => {
@@ -239,6 +246,11 @@ describe('ComColFormComponent', () => {
           it('should display a success notification', () => {
             expect(notificationsService.success).toHaveBeenCalled();
           });
+
+          it('should remove the object\'s cache', () => {
+            expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalled();
+            expect(objectCacheStub.remove).toHaveBeenCalled();
+          });
         });
 
         describe('when dsoService.deleteLogo returns an error response', () => {
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
index f8199d2aad..91e896ce6c 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
@@ -25,6 +25,7 @@ import { hasValue, isNotEmpty } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { UploaderOptions } from '../../uploader/uploader-options.model';
 import { UploaderComponent } from '../../uploader/uploader.component';
+import { Operation } from 'fast-json-patch';
 
 /**
  * A form for creating and editing Communities or Collections
@@ -85,7 +86,8 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
   @Output() submitForm: EventEmitter<{
     dso: T,
     uploader: FileUploader,
-    deleteLogo: boolean
+    deleteLogo: boolean,
+    operations: Operation[],
   }> = new EventEmitter();
 
   /**
@@ -189,9 +191,9 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
     const formMetadata = {}  as MetadataMap;
     this.formModel.forEach((fieldModel: DynamicInputModel) => {
       const value: MetadataValue = {
-          value: fieldModel.value as string,
-          language: null
-        } as any;
+        value: fieldModel.value as string,
+        language: null
+      } as any;
       if (formMetadata.hasOwnProperty(fieldModel.name)) {
         formMetadata[fieldModel.name].push(value);
       } else {
@@ -206,10 +208,26 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
       },
       type: Community.type
     });
+
+    const operations: Operation[] = [];
+    this.formModel.forEach((fieldModel: DynamicInputModel) => {
+      if (fieldModel.value !== this.dso.firstMetadataValue(fieldModel.name)) {
+        operations.push({
+          op: 'replace',
+          path: `/metadata/${fieldModel.name}`,
+          value: {
+            value: fieldModel.value,
+            language: null,
+          },
+        });
+      }
+    });
+
     this.submitForm.emit({
       dso: updatedDSO,
       uploader: hasValue(this.uploaderComponent) ? this.uploaderComponent.uploader : undefined,
-      deleteLogo: this.markLogoForDeletion
+      deleteLogo: this.markLogoForDeletion,
+      operations: operations,
     });
   }
 
@@ -257,7 +275,9 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDe
    * The request was successful, display a success notification
    */
   public onCompleteItem() {
-    this.refreshCache();
+    if (hasValue(this.dso.id)) {
+      this.refreshCache();
+    }
     this.notificationsService.success(null, this.translate.get(this.type.value + '.edit.logo.notifications.add.success'));
     this.finish.emit();
   }
diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
index a8d6499cbd..4a7cd9afb1 100644
--- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
+++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
@@ -77,7 +77,8 @@ export class CreateComColPageComponent<TDomain extends DSpaceObject> implements
     const uploader = event.uploader;
 
     this.parentUUID$.pipe(take(1)).subscribe((uuid: string) => {
-      this.dsoDataService.create(dso, new RequestParam('parent', uuid))
+      const params = uuid ? [new RequestParam('parent', uuid)] : [];
+      this.dsoDataService.create(dso, ...params)
         .pipe(getSucceededRemoteData())
         .subscribe((dsoRD: RemoteData<TDomain>) => {
           if (isNotUndefined(dsoRD)) {
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
index 414d64cbff..b50a1d3ac4 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
@@ -13,13 +13,13 @@ import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { SharedModule } from '../../../shared.module';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
 import { ComcolMetadataComponent } from './comcol-metadata.component';
 
 describe('ComColMetadataComponent', () => {
   let comp: ComcolMetadataComponent<DSpaceObject>;
   let fixture: ComponentFixture<ComcolMetadataComponent<DSpaceObject>>;
-  let dsoDataService: CommunityDataService;
+  let dsoDataService;
   let router: Router;
 
   let community;
@@ -49,6 +49,7 @@ describe('ComColMetadataComponent', () => {
 
     communityDataServiceStub = {
       update: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity),
+      patch: () => null,
       getLogoEndpoint: () => observableOf(logoEndpoint)
     };
 
@@ -95,37 +96,60 @@ describe('ComColMetadataComponent', () => {
     describe('with an empty queue in the uploader', () => {
       beforeEach(() => {
         data = {
-          dso: Object.assign(new Community(), {
-            metadata: [{
-              key: 'dc.title',
-              value: 'test'
-            }]
-          }),
+          operations: [
+            {
+              op: 'replace',
+              path: '/metadata/dc.title',
+              value: {
+                value: 'test',
+                language: null,
+              },
+            },
+          ],
+          dso: new Community(),
           uploader: {
             options: {
               url: ''
             },
             queue: [],
             /* tslint:disable:no-empty */
-            uploadAll: () => {}
+            uploadAll: () => {
+            }
             /* tslint:enable:no-empty */
-          }
-        }
+          },
+          deleteLogo: false,
+        };
+        spyOn(router, 'navigate');
       });
 
-      it('should navigate when successful', () => {
-        spyOn(router, 'navigate');
-        comp.onSubmit(data);
-        fixture.detectChanges();
-        expect(router.navigate).toHaveBeenCalled();
+      describe('when successful', () => {
+
+        beforeEach(() => {
+          spyOn(dsoDataService, 'patch').and.returnValue(observableOf({
+              isSuccessful: true,
+          }));
+        });
+
+        it('should navigate', () => {
+          comp.onSubmit(data);
+          fixture.detectChanges();
+          expect(router.navigate).toHaveBeenCalled();
+        });
       });
 
-      it('should not navigate on failure', () => {
-        spyOn(router, 'navigate');
-        spyOn(dsoDataService, 'update').and.returnValue(createFailedRemoteDataObject$(newCommunity));
-        comp.onSubmit(data);
-        fixture.detectChanges();
-        expect(router.navigate).not.toHaveBeenCalled();
+      describe('on failure', () => {
+
+        beforeEach(() => {
+          spyOn(dsoDataService, 'patch').and.returnValue(observableOf({
+              isSuccessful: false,
+            }));
+        });
+
+        it('should not navigate', () => {
+          comp.onSubmit(data);
+          fixture.detectChanges();
+          expect(router.navigate).not.toHaveBeenCalled();
+        });
       });
     });
 
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
index 1031fead10..02c28d989c 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
@@ -5,8 +5,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { ActivatedRoute, Router } from '@angular/router';
 import { first, map, take } from 'rxjs/operators';
 import { getSucceededRemoteData } from '../../../../core/shared/operators';
-import { hasValue, isNotUndefined } from '../../../empty.util';
-import { DataService } from '../../../../core/data/data.service';
+import { hasValue, isEmpty } from '../../../empty.util';
 import { ResourceType } from '../../../../core/shared/resource-type';
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
 import { NotificationsService } from '../../../notifications/notifications.service';
@@ -49,26 +48,33 @@ export class ComcolMetadataComponent<TDomain extends DSpaceObject> implements On
    * @param event   The event returned by the community/collection form. Contains the new dso and logo uploader
    */
   onSubmit(event) {
-    const dso = event.dso;
+
     const uploader = event.uploader;
     const deleteLogo = event.deleteLogo;
 
-    this.dsoDataService.update(dso)
-      .pipe(getSucceededRemoteData())
-      .subscribe((dsoRD: RemoteData<TDomain>) => {
-        if (isNotUndefined(dsoRD)) {
-          const newUUID = dsoRD.payload.uuid;
-          if (hasValue(uploader) && uploader.queue.length > 0) {
-            this.dsoDataService.getLogoEndpoint(newUUID).pipe(take(1)).subscribe((href: string) => {
-              uploader.options.url = href;
-              uploader.uploadAll();
-            });
-          } else if (!deleteLogo) {
-            this.router.navigate([this.frontendURL + newUUID]);
-          }
-          this.notificationsService.success(null, this.translate.get(this.type.value + '.edit.notifications.success'));
-        }
+    const newLogo = hasValue(uploader) && uploader.queue.length > 0;
+    if (newLogo) {
+      this.dsoDataService.getLogoEndpoint(event.dso.uuid).pipe(take(1)).subscribe((href: string) => {
+        uploader.options.url = href;
+        uploader.uploadAll();
       });
+    }
+
+    if (!isEmpty(event.operations)) {
+      this.dsoDataService.patch(event.dso, event.operations)
+        .subscribe(async (response) => {
+          if (response.isSuccessful) {
+            if (!newLogo && !deleteLogo) {
+              await this.router.navigate([this.frontendURL + event.dso.uuid]);
+            }
+            this.notificationsService.success(null, this.translate.get(`${this.type.value}.edit.notifications.success`));
+          } else if (response.statusCode === 403) {
+            this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.unauthorized`));
+          } else {
+            this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.error`));
+          }
+        });
+    }
   }
 
   /**
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
index 480f6ff709..df62534593 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
@@ -39,7 +39,15 @@ describe('CreateCollectionParentSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ community: communityRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: communityRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index e6a0db3b62..d0ba9c7108 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -14,6 +14,6 @@
         </h3>
 
         <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
-        <ds-dso-selector [currentDSOId]="(dsoRD$ | async)?.payload.uuid" [type]="selectorType" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [type]="selectorType" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
index b723d3fe98..9c6185199c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.spec.ts
@@ -33,7 +33,15 @@ describe('CreateCommunityParentSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ community: communityRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: communityRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
new file mode 100644
index 0000000000..ef8865ad87
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <ds-collection-dropdown (selectionChange)="selectObject($event.collection)">
+    </ds-collection-dropdown>
+  </div>
+</div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
index 854349a47c..e8cd35fb50 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
@@ -32,7 +32,15 @@ describe('CreateItemParentSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ collection: collectionRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: collectionRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index 02a0bd79cd..45d15ae306 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -13,7 +13,8 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-sel
 @Component({
   selector: 'ds-create-item-parent-selector',
   // styleUrls: ['./create-item-parent-selector.component.scss'],
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  // templateUrl: '../dso-selector-modal-wrapper.component.html',
+  templateUrl: './create-item-parent-selector.component.html'
 })
 export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
index 1181e097eb..4800bb8733 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -5,6 +5,6 @@
     </button>
   </div>
   <div class="modal-body">
-    <ds-dso-selector [currentDSOId]="(dsoRD$ | async)?.payload.uuid ? 'search.resourceid:' + (dsoRD$ | async)?.payload.uuid : null" [type]="selectorType" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid ? 'search.resourceid:' + dsoRD?.payload.uuid : null" [type]="selectorType" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
index 7b5c020f1b..f52ce3fc8f 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
@@ -41,8 +41,16 @@ describe('DSOSelectorModalWrapperComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ item: itemRD }) } } } }
-        }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: itemRD,
+                },
+              },
+            }
+          }
+        },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -63,11 +71,7 @@ describe('DSOSelectorModalWrapperComponent', () => {
   });
 
   it('should initially set the DSO to the activated route\'s item/collection/community', () => {
-    component.dsoRD$
-      .pipe(first())
-      .subscribe((a) => {
-        expect(a).toEqual(itemRD);
-      })
+    expect(component.dsoRD).toEqual(itemRD);
   });
 
   describe('selectObject', () => {
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
index 881476cac6..c13bd2b69d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
@@ -1,11 +1,12 @@
 import { Injectable, Input, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { map } from 'rxjs/operators';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import { hasValue, isNotEmpty } from '../../empty.util';
 
 export enum SelectorActionType {
   CREATE = 'create',
@@ -21,7 +22,7 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
   /**
    * The current page's DSO
    */
-  @Input() dsoRD$: Observable<RemoteData<DSpaceObject>>;
+  @Input() dsoRD: RemoteData<DSpaceObject>;
 
   /**
    * The type of the DSO that's being edited or created
@@ -45,10 +46,30 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
    * Get de current page's DSO based on the selectorType
    */
   ngOnInit(): void {
-    const typeString = this.selectorType.toString().toLowerCase();
-    this.dsoRD$ = this.route.root.firstChild.firstChild.data.pipe(map((data) => data[typeString]));
+    const matchingRoute = this.findRouteData(
+      (route: ActivatedRouteSnapshot) => hasValue(route.data.dso),
+      this.route.root.snapshot
+    );
+    if (hasValue(matchingRoute)) {
+      this.dsoRD = matchingRoute.data.dso;
+    }
   }
 
+  findRouteData(predicate: (value: ActivatedRouteSnapshot, index?: number, obj?: ActivatedRouteSnapshot[]) => unknown, ...routes: ActivatedRouteSnapshot[]) {
+    const result = routes.find(predicate);
+    if (hasValue(result)) {
+      return result;
+    } else {
+      const nextLevelRoutes = routes
+        .map((route: ActivatedRouteSnapshot) => route.children)
+        .reduce((combined: ActivatedRouteSnapshot[], current: ActivatedRouteSnapshot[]) => [...combined, ...current]);
+      if (isNotEmpty(nextLevelRoutes)) {
+        return this.findRouteData(predicate, ...nextLevelRoutes)
+      } else {
+        return undefined;
+      }
+    }
+  }
   /**
    * Method called when an object has been selected
    * @param dso The selected DSpaceObject
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
index a17d9e4c21..21ff5e846d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
@@ -33,7 +33,15 @@ describe('EditCollectionSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ collection: collectionRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: collectionRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
index c48d29baa9..b37fa23024 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
@@ -33,7 +33,15 @@ describe('EditCommunitySelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ community: communityRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: communityRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
index 582320acae..e310d6ac02 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
@@ -33,7 +33,15 @@ describe('EditItemSelectorComponent', () => {
         { provide: NgbActiveModal, useValue: modalStub },
         {
           provide: ActivatedRoute,
-          useValue: { root: { firstChild: { firstChild: { data: observableOf({ item: itemRD }) } } } }
+          useValue: {
+            root: {
+              snapshot: {
+                data: {
+                  dso: itemRD,
+                },
+              },
+            }
+          },
         },
         {
           provide: Router, useValue: router
diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
new file mode 100644
index 0000000000..06624c8b40
--- /dev/null
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -0,0 +1,6 @@
+<a *ngIf="!(isAuthenticated$ | async)" [href]="href" [download]="download"><ng-container *ngTemplateOutlet="content"></ng-container></a>
+<a *ngIf="(isAuthenticated$ | async)" [href]="href" [download]="download" (click)="downloadFile()"><ng-container *ngTemplateOutlet="content"></ng-container></a>
+
+<ng-template #content>
+  <ng-content></ng-content>
+</ng-template>
diff --git a/src/app/shared/file-download-link/file-download-link.component.scss b/src/app/shared/file-download-link/file-download-link.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/file-download-link/file-download-link.component.spec.ts b/src/app/shared/file-download-link/file-download-link.component.spec.ts
new file mode 100644
index 0000000000..ac1751d43d
--- /dev/null
+++ b/src/app/shared/file-download-link/file-download-link.component.spec.ts
@@ -0,0 +1,57 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { FileDownloadLinkComponent } from './file-download-link.component';
+import { AuthService } from '../../core/auth/auth.service';
+import { FileService } from '../../core/shared/file.service';
+import { of as observableOf } from 'rxjs';
+
+describe('FileDownloadLinkComponent', () => {
+  let component: FileDownloadLinkComponent;
+  let fixture: ComponentFixture<FileDownloadLinkComponent>;
+
+  let authService: AuthService;
+  let fileService: FileService;
+  let href: string;
+
+  function init() {
+    authService = jasmine.createSpyObj('authService', {
+      isAuthenticated: observableOf(true)
+    });
+    fileService = jasmine.createSpyObj('fileService', ['downloadFile']);
+    href = 'test-download-file-link';
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [ FileDownloadLinkComponent ],
+      providers: [
+        { provide: AuthService, useValue: authService },
+        { provide: FileService, useValue: fileService }
+      ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(FileDownloadLinkComponent);
+    component = fixture.componentInstance;
+    component.href = href;
+    fixture.detectChanges();
+  });
+
+  describe('downloadFile', () => {
+    let result;
+
+    beforeEach(() => {
+      result = component.downloadFile();
+    });
+
+    it('should call fileService.downloadFile with the provided href', () => {
+      expect(fileService.downloadFile).toHaveBeenCalledWith(href);
+    });
+
+    it('should return false', () => {
+      expect(result).toEqual(false);
+    });
+  });
+});
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
new file mode 100644
index 0000000000..9df7c191ff
--- /dev/null
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -0,0 +1,48 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { FileService } from '../../core/shared/file.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { AuthService } from '../../core/auth/auth.service';
+
+@Component({
+  selector: 'ds-file-download-link',
+  templateUrl: './file-download-link.component.html',
+  styleUrls: ['./file-download-link.component.scss']
+})
+/**
+ * Component displaying a download link
+ * When the user is authenticated, a short-lived token retrieved from the REST API is added to the download link,
+ * ensuring the user is authorized to download the file.
+ */
+export class FileDownloadLinkComponent implements OnInit {
+  /**
+   * Href to link to
+   */
+  @Input() href: string;
+
+  /**
+   * Optional file name for the download
+   */
+  @Input() download: string;
+
+  /**
+   * Whether or not the current user is authenticated
+   */
+  isAuthenticated$: Observable<boolean>;
+
+  constructor(private fileService: FileService,
+              private authService: AuthService) { }
+
+  ngOnInit() {
+    this.isAuthenticated$ = this.authService.isAuthenticated();
+  }
+
+  /**
+   * Start a download of the file
+   * Return false to ensure the original href is displayed when the user hovers over the link
+   */
+  downloadFile(): boolean {
+    this.fileService.downloadFile(this.href);
+    return false;
+  }
+
+}
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 8e23f00d9b..5285bc65e4 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -8,6 +8,6 @@
   </ng-container>
 
   <div class="dropdown-divider"></div>
-  <a class="dropdown-item" href="#">{{"login.form.new-user" | translate}}</a>
-  <a class="dropdown-item" href="#">{{"login.form.forgot-password" | translate}}</a>
+  <a class="dropdown-item" [routerLink]="[getRegisterPath()]">{{"login.form.new-user" | translate}}</a>
+  <a class="dropdown-item" [routerLink]="[getForgotPath()]">{{"login.form.forgot-password" | translate}}</a>
 </div>
diff --git a/src/app/shared/log-in/log-in.component.spec.ts b/src/app/shared/log-in/log-in.component.spec.ts
index 0167d61686..a9a42bf3dd 100644
--- a/src/app/shared/log-in/log-in.component.spec.ts
+++ b/src/app/shared/log-in/log-in.component.spec.ts
@@ -1,7 +1,7 @@
 import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Store, StoreModule } from '@ngrx/store';
+import { StoreModule } from '@ngrx/store';
 
 import { LogInComponent } from './log-in.component';
 import { authReducer } from '../../core/auth/auth.reducer';
@@ -13,11 +13,11 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { SharedModule } from '../shared.module';
 import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref';
 import { ActivatedRouteStub } from '../testing/active-router.stub';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../testing/router.stub';
+import { ActivatedRoute } from '@angular/router';
 import { NativeWindowService } from '../../core/services/window.service';
 import { provideMockStore } from '@ngrx/store/testing';
 import { createTestComponent } from '../testing/utils.test';
+import { RouterTestingModule } from '@angular/router/testing';
 
 describe('LogInComponent', () => {
 
@@ -46,6 +46,7 @@ describe('LogInComponent', () => {
             strictActionImmutability: false
           }
         }),
+        RouterTestingModule,
         SharedModule,
         TranslateModule.forRoot()
       ],
@@ -55,7 +56,7 @@ describe('LogInComponent', () => {
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
-        { provide: Router, useValue: new RouterStub() },
+        // { provide: Router, useValue: new RouterStub() },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
         provideMockStore({ initialState }),
         LogInComponent
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index 92350de442..32e10fef45 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -8,6 +8,7 @@ import { AuthMethod } from '../../core/auth/models/auth.method';
 import { getAuthenticationMethods, isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors';
 import { CoreState } from '../../core/core.reducers';
 import { AuthService } from '../../core/auth/auth.service';
+import { getForgotPasswordPath, getRegisterPath } from '../../app-routing.module';
 
 /**
  * /users/sign-in
@@ -82,4 +83,11 @@ export class LogInComponent implements OnInit, OnDestroy {
     this.alive = false;
   }
 
+  getRegisterPath() {
+    return getRegisterPath();
+  }
+
+  getForgotPath() {
+    return getForgotPasswordPath();
+  }
 }
diff --git a/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts b/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts
index aa13b57d7b..7e6124e311 100644
--- a/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts
+++ b/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts
@@ -62,10 +62,10 @@ export class EndpointMockingRestService extends DSpaceRESTv2Service {
    * @return Observable<DSpaceRESTV2Response>
    *      An Observable<DSpaceRESTV2Response> containing the response from the server
    */
-  request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions): Observable<DSpaceRESTV2Response> {
+  request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions, isMultipart?: boolean): Observable<DSpaceRESTV2Response> {
     const mockData = this.getMockData(url);
     if (isEmpty(mockData)) {
-      return super.request(method, url, body, options);
+      return super.request(method, url, body, options, isMultipart);
     } else {
       return this.toMockResponse$(mockData);
     }
diff --git a/src/app/shared/mocks/request.service.mock.ts b/src/app/shared/mocks/request.service.mock.ts
index da297f56ac..385195bc77 100644
--- a/src/app/shared/mocks/request.service.mock.ts
+++ b/src/app/shared/mocks/request.service.mock.ts
@@ -11,7 +11,7 @@ export function getMockRequestService(requestEntry$: Observable<RequestEntry> =
     getByUUID: requestEntry$,
     uriEncodeBody: jasmine.createSpy('uriEncodeBody'),
     isCachedOrPending: false,
-    removeByHrefSubstring: jasmine.createSpy('removeByHrefSubstring'),
+    removeByHrefSubstring: observableOf(true),
     hasByHrefObservable: observableOf(false)
   });
 }
diff --git a/src/app/shared/notifications/notifications.service.ts b/src/app/shared/notifications/notifications.service.ts
index fa65d69530..ab21ab61f7 100644
--- a/src/app/shared/notifications/notifications.service.ts
+++ b/src/app/shared/notifications/notifications.service.ts
@@ -75,7 +75,7 @@ export class NotificationsService {
     this.translate.get(hrefTranslateLabel)
       .pipe(first())
       .subscribe((hrefMsg) => {
-        const anchor = `<a class="btn btn-link p-0 m-0" href="${href}" >
+        const anchor = `<a class="align-baseline btn btn-link p-0 m-0" href="${href}" >
                         <strong>${hrefMsg}</strong>
                       </a>`;
         const interpolateParams = Object.create({});
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
index 9fcfd21586..5fd7f3ec56 100644
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
+++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
@@ -12,14 +12,16 @@ import { take } from 'rxjs/operators';
 import { PaginationComponent } from '../pagination/pagination.component';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
 import { createPaginatedList } from '../testing/utils.test';
+import { ObjectValuesPipe } from '../utils/object-values-pipe';
 
 class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDragAndDropListComponent<DSpaceObject> {
 
   constructor(protected objectUpdatesService: ObjectUpdatesService,
               protected elRef: ElementRef,
+              protected objectValuesPipe: ObjectValuesPipe,
               protected mockUrl: string,
               protected mockObjectsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>) {
-    super(objectUpdatesService, elRef);
+    super(objectUpdatesService, elRef, objectValuesPipe);
   }
 
   initializeObjectsRD(): void {
@@ -35,6 +37,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
   let component: MockAbstractPaginatedDragAndDropListComponent;
   let objectUpdatesService: ObjectUpdatesService;
   let elRef: ElementRef;
+  let objectValuesPipe: ObjectValuesPipe;
 
   const url = 'mock-abstract-paginated-drag-and-drop-list-component';
 
@@ -52,32 +55,26 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
 
   beforeEach(() => {
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
-      initializeWithCustomOrder: {},
-      addPageToCustomOrder: {},
-      getFieldUpdatesByCustomOrder: observableOf(updates),
-      saveMoveFieldUpdate: {}
+      initialize: {},
+      getFieldUpdatesExclusive: observableOf(updates)
     });
     elRef = {
       nativeElement: jasmine.createSpyObj('nativeElement', {
         querySelector: {}
       })
     };
+    objectValuesPipe = new ObjectValuesPipe();
     paginationComponent = jasmine.createSpyObj('paginationComponent', {
       doPageChange: {}
     });
     objectsRD$ = new BehaviorSubject(objectsRD);
-    component = new MockAbstractPaginatedDragAndDropListComponent(objectUpdatesService, elRef, url, objectsRD$);
+    component = new MockAbstractPaginatedDragAndDropListComponent(objectUpdatesService, elRef, objectValuesPipe, url, objectsRD$);
     component.paginationComponent = paginationComponent;
     component.ngOnInit();
   });
 
-  it('should call initializeWithCustomOrder to initialize the first page and add it to initializedPages', (done) => {
-    expect(component.initializedPages.indexOf(0)).toBeLessThan(0);
-    component.updates$.pipe(take(1)).subscribe(() => {
-      expect(objectUpdatesService.initializeWithCustomOrder).toHaveBeenCalled();
-      expect(component.initializedPages.indexOf(0)).toBeGreaterThanOrEqual(0);
-      done();
-    });
+  it('should call initialize to initialize the objects in the store', () => {
+    expect(objectUpdatesService.initialize).toHaveBeenCalled();
   });
 
   it('should initialize the updates correctly', (done) => {
@@ -87,43 +84,6 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
     });
   });
 
-  describe('when a new page is loaded', () => {
-    const page = 5;
-
-    beforeEach((done) => {
-      component.updates$.pipe(take(1)).subscribe(() => {
-        component.currentPage$.next(page);
-        objectsRD$.next(objectsRD);
-        done();
-      });
-    });
-
-    it('should call addPageToCustomOrder to initialize the new page and add it to initializedPages', (done) => {
-      component.updates$.pipe(take(1)).subscribe(() => {
-        expect(objectUpdatesService.addPageToCustomOrder).toHaveBeenCalled();
-        expect(component.initializedPages.indexOf(page - 1)).toBeGreaterThanOrEqual(0);
-        done();
-      });
-    });
-
-    describe('twice', () => {
-      beforeEach((done) => {
-        component.updates$.pipe(take(1)).subscribe(() => {
-          component.currentPage$.next(page);
-          objectsRD$.next(objectsRD);
-          done();
-        });
-      });
-
-      it('shouldn\'t call addPageToCustomOrder again, as the page has already been initialized', (done) => {
-        component.updates$.pipe(take(1)).subscribe(() => {
-          expect(objectUpdatesService.addPageToCustomOrder).toHaveBeenCalledTimes(1);
-          done();
-        });
-      });
-    });
-  });
-
   describe('switchPage', () => {
     const page = 3;
 
@@ -149,30 +109,31 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
 
       beforeEach(() => {
         elRef.nativeElement.querySelector.and.returnValue(hoverElement);
-        component.initializedPages.push(hoverPage - 1);
+        spyOn(component.dropObject, 'emit');
         component.drop(event);
       });
 
-      it('should detect the page and set currentPage$ to its value', () => {
-        expect(component.currentPage$.value).toEqual(hoverPage);
-      });
-
-      it('should detect the page and update the pagination component with its value', () => {
-        expect(paginationComponent.doPageChange).toHaveBeenCalledWith(hoverPage);
-      });
-
-      it('should send out a saveMoveFieldUpdate with the correct values', () => {
-        expect(objectUpdatesService.saveMoveFieldUpdate).toHaveBeenCalledWith(url, event.previousIndex, 0, 0, hoverPage - 1, object1);
+      it('should send out a dropObject event with the expected processed paginated indexes', () => {
+        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
+          fromIndex: ((component.currentPage$.value - 1) * component.pageSize) + event.previousIndex,
+          toIndex: ((hoverPage - 1) * component.pageSize),
+          finish: jasmine.anything()
+        }));
       });
     });
 
     describe('when the user is not hovering over a new page', () => {
       beforeEach(() => {
+        spyOn(component.dropObject, 'emit');
         component.drop(event);
       });
 
-      it('should send out a saveMoveFieldUpdate with the correct values', () => {
-        expect(objectUpdatesService.saveMoveFieldUpdate).toHaveBeenCalledWith(url, event.previousIndex, event.currentIndex, 0, 0);
+      it('should send out a dropObject event with the expected properties', () => {
+        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
+          fromIndex: event.previousIndex,
+          toIndex: event.currentIndex,
+          finish: jasmine.anything()
+        }));
       });
     });
   });
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
index a34b5d5bc0..f8a4cdee61 100644
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
+++ b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
@@ -1,23 +1,33 @@
-import { FieldUpdates } from '../../core/data/object-updates/object-updates.reducer';
+import { FieldUpdate, FieldUpdates } from '../../core/data/object-updates/object-updates.reducer';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { switchMap, take, tap } from 'rxjs/operators';
-import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
+import { distinctUntilChanged, map, switchMap, take } from 'rxjs/operators';
+import { hasValue, isNotEmpty } from '../empty.util';
 import { paginatedListToArray } from '../../core/shared/operators';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { CdkDragDrop } from '@angular/cdk/drag-drop';
-import { ElementRef, ViewChild } from '@angular/core';
+import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { ElementRef, EventEmitter, OnDestroy, Output, ViewChild } from '@angular/core';
 import { PaginationComponent } from '../pagination/pagination.component';
+import { ObjectValuesPipe } from '../utils/object-values-pipe';
+import { compareArraysUsing } from '../../+item-page/simple/item-types/shared/item-relationships-utils';
+import { Subscription } from 'rxjs/internal/Subscription';
+
+/**
+ * Operator used for comparing {@link FieldUpdate}s by their field's UUID
+ */
+export const compareArraysUsingFieldUuids = () =>
+  compareArraysUsing((fieldUpdate: FieldUpdate) => (hasValue(fieldUpdate) && hasValue(fieldUpdate.field)) ? fieldUpdate.field.uuid : undefined);
 
 /**
  * An abstract component containing general methods and logic to be able to drag and drop objects within a paginated
  * list. This implementation supports being able to drag and drop objects between pages.
- * Dragging an object on top of a page number will automatically detect the page it's being dropped on, send an update
- * to the store and add the object on top of that page.
+ * Dragging an object on top of a page number will automatically detect the page it's being dropped on and send a
+ * dropObject event to the parent component containing detailed information about the indexes the object was dropped from
+ * and to.
  *
  * To extend this component, it is important to make sure to:
  * - Initialize objectsRD$ within the initializeObjectsRD() method
@@ -28,12 +38,19 @@ import { PaginationComponent } from '../pagination/pagination.component';
  *
  * An example component extending from this abstract component: PaginatedDragAndDropBitstreamListComponent
  */
-export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> {
+export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnDestroy {
   /**
    * A view on the child pagination component
    */
   @ViewChild(PaginationComponent, {static: false}) paginationComponent: PaginationComponent;
 
+  /**
+   * Send an event when the user drops an object on the pagination
+   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
+   * not just within a single page)
+   */
+  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
+
   /**
    * The URL to use for accessing the object updates from this list
    */
@@ -49,6 +66,12 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
    */
   updates$: Observable<FieldUpdates>;
 
+  /**
+   * A list of object UUIDs
+   * This is the order the objects will be displayed in
+   */
+  customOrder: string[];
+
   /**
    * The amount of objects to display per page
    */
@@ -70,23 +93,21 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   currentPage$ = new BehaviorSubject<number>(1);
 
   /**
-   * A list of pages that have been initialized in the field-update store
+   * Whether or not we should display a loading animation
+   * This is used to display a loading page when the user drops a bitstream onto a new page. The loading animation
+   * should stop once the bitstream has moved to the new page and the new page's response has loaded and contains the
+   * dropped object on top (see this.stopLoadingWhenFirstIs below)
    */
-  initializedPages: number[] = [];
+  loading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   /**
-   * An object storing information about an update that should be fired whenever fireToUpdate is called
+   * List of subscriptions
    */
-  toUpdate: {
-    fromIndex: number,
-    toIndex: number,
-    fromPage: number,
-    toPage: number,
-    field?: T
-  };
+  subs: Subscription[] = [];
 
   protected constructor(protected objectUpdatesService: ObjectUpdatesService,
-                        protected elRef: ElementRef) {
+                        protected elRef: ElementRef,
+                        protected objectValuesPipe: ObjectValuesPipe) {
   }
 
   /**
@@ -110,28 +131,29 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
 
   /**
    * Initialize the field-updates in the store
-   * This method ensures (new) pages displayed are automatically added to the field-update store when the objectsRD updates
    */
   initializeUpdates(): void {
+    this.objectsRD$.pipe(
+      paginatedListToArray(),
+      take(1)
+    ).subscribe((objects: T[]) => {
+      this.objectUpdatesService.initialize(this.url, objects, new Date());
+    });
     this.updates$ = this.objectsRD$.pipe(
       paginatedListToArray(),
-      tap((objects: T[]) => {
-        // Pages in the field-update store are indexed starting at 0 (because they're stored in an array of pages)
-        const updatesPage = this.currentPage$.value - 1;
-        if (isEmpty(this.initializedPages)) {
-          // No updates have been initialized yet for this list, initialize the first page
-          this.objectUpdatesService.initializeWithCustomOrder(this.url, objects, new Date(), this.pageSize, updatesPage);
-          this.initializedPages.push(updatesPage);
-        } else if (this.initializedPages.indexOf(updatesPage) < 0) {
-          // Updates were initialized for this list, but not the page we're on. Add the current page to the field-update store for this list
-          this.objectUpdatesService.addPageToCustomOrder(this.url, objects, updatesPage);
-          this.initializedPages.push(updatesPage);
-        }
-
-        // The new page is loaded into the store, check if there are any updates waiting and fire those as well
-        this.fireToUpdate();
+      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, objects))
+    );
+    this.subs.push(
+      this.updates$.pipe(
+        map((fieldUpdates) => this.objectValuesPipe.transform(fieldUpdates)),
+        distinctUntilChanged(compareArraysUsingFieldUuids())
+      ).subscribe((updateValues) => {
+        this.customOrder = updateValues.map((fieldUpdate) => fieldUpdate.field.uuid);
+        // We received new values, stop displaying a loading indicator if it's present
+        this.loading$.next(false);
       }),
-      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesByCustomOrder(this.url, objects, this.currentPage$.value - 1))
+      // Disable the pagination when objects are loading
+      this.loading$.subscribe((loading) => this.options.disabled = loading)
     );
   }
 
@@ -144,52 +166,60 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   }
 
   /**
-   * An object was moved, send updates to the store.
+   * An object was moved, send updates to the dropObject EventEmitter
    * When the object is dropped on a page within the pagination of this component, the object moves to the top of that
-   * page and the pagination automatically loads and switches the view to that page.
+   * page and the pagination automatically loads and switches the view to that page (this is done by calling the event's
+   * finish() method after sending patch requests to the REST API)
    * @param event
    */
   drop(event: CdkDragDrop<any>) {
+    const dragIndex = event.previousIndex;
+    let dropIndex = event.currentIndex;
+    const dragPage = this.currentPage$.value - 1;
+    let dropPage = this.currentPage$.value - 1;
+
     // Check if the user is hovering over any of the pagination's pages at the time of dropping the object
     const droppedOnElement = this.elRef.nativeElement.querySelector('.page-item:hover');
     if (hasValue(droppedOnElement) && hasValue(droppedOnElement.textContent)) {
       // The user is hovering over a page, fetch the page's number from the element
-      const page = Number(droppedOnElement.textContent);
-      if (hasValue(page) && !Number.isNaN(page)) {
-        const id = event.item.element.nativeElement.id;
-        this.updates$.pipe(take(1)).subscribe((updates: FieldUpdates) => {
-          const field = hasValue(updates[id]) ? updates[id].field : undefined;
-          this.toUpdate = Object.assign({
-            fromIndex: event.previousIndex,
-            toIndex: 0,
-            fromPage: this.currentPage$.value - 1,
-            toPage: page - 1,
-            field
-          });
-          // Switch to the dropped-on page and force a page update for the pagination component
-          this.currentPage$.next(page);
-          this.paginationComponent.doPageChange(page);
-          if (this.initializedPages.indexOf(page - 1) >= 0) {
-            // The page the object is being dropped to has already been loaded before, directly fire an update to the store.
-            // For pages that haven't been loaded before, the updates$ observable will call fireToUpdate after the new page
-            // has loaded
-            this.fireToUpdate();
-          }
-        });
+      const droppedPage = Number(droppedOnElement.textContent);
+      if (hasValue(droppedPage) && !Number.isNaN(droppedPage)) {
+        dropPage = droppedPage - 1;
+        dropIndex = 0;
       }
-    } else {
-      this.objectUpdatesService.saveMoveFieldUpdate(this.url, event.previousIndex, event.currentIndex, this.currentPage$.value - 1, this.currentPage$.value - 1);
+    }
+
+    const isNewPage = dragPage !== dropPage;
+    // Move the object in the custom order array if the drop happened within the same page
+    // This allows us to instantly display a change in the order, instead of waiting for the REST API's response first
+    if (!isNewPage && dragIndex !== dropIndex) {
+      moveItemInArray(this.customOrder, dragIndex, dropIndex);
+    }
+
+    const redirectPage = dropPage + 1;
+    const fromIndex = (dragPage * this.pageSize) + dragIndex;
+    const toIndex = (dropPage * this.pageSize) + dropIndex;
+    // Send out a drop event (and navigate to the new page) when the "from" and "to" indexes are different from each other
+    if (fromIndex !== toIndex) {
+      if (isNewPage) {
+        this.loading$.next(true);
+      }
+      this.dropObject.emit(Object.assign({
+        fromIndex,
+        toIndex,
+        finish: () => {
+          if (isNewPage) {
+            this.paginationComponent.doPageChange(redirectPage);
+          }
+        }
+      }));
     }
   }
 
   /**
-   * Method checking if there's an update ready to be fired. Send out a MoveFieldUpdate to the store if there's an
-   * update present and clear the update afterwards.
+   * unsub all subscriptions
    */
-  fireToUpdate() {
-    if (hasValue(this.toUpdate)) {
-      this.objectUpdatesService.saveMoveFieldUpdate(this.url, this.toUpdate.fromIndex, this.toUpdate.toIndex, this.toUpdate.fromPage, this.toUpdate.toPage, this.toUpdate.field);
-      this.toUpdate = undefined;
-    }
+  ngOnDestroy(): void {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 }
diff --git a/src/app/shared/pagination/pagination.utils.ts b/src/app/shared/pagination/pagination.utils.ts
new file mode 100644
index 0000000000..5701c96b54
--- /dev/null
+++ b/src/app/shared/pagination/pagination.utils.ts
@@ -0,0 +1,14 @@
+import { PaginationComponentOptions } from './pagination-component-options.model';
+import { FindListOptions } from '../../core/data/request.models';
+
+/**
+ * Transform a PaginationComponentOptions object into a FindListOptions object
+ * @param pagination  The PaginationComponentOptions to transform
+ * @param original    An original FindListOptions object to start from
+ */
+export function toFindListOptions(pagination: PaginationComponentOptions, original?: FindListOptions): FindListOptions {
+  return Object.assign(new FindListOptions(), original, {
+    currentPage: pagination.currentPage,
+    elementsPerPage: pagination.pageSize
+  });
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 67d7db5c5d..98526bf2bc 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -189,6 +189,8 @@ import { CustomSwitchComponent } from './form/builder/ds-dynamic-form-ui/models/
 import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
 import { MissingTranslationHelper } from './translate/missing-translation.helper';
 import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-versions-notice.component';
+import { FileValidator } from './utils/require-file.validator';
+import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
 import { ModifyItemOverviewComponent } from '../+item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
 import { ClaimedTaskActionsLoaderComponent } from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
 import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
@@ -202,6 +204,8 @@ import { ResourcePolicyTargetResolver } from './resource-policies/resolvers/reso
 import { ResourcePolicyResolver } from './resource-policies/resolvers/resource-policy.resolver';
 import { EpersonSearchBoxComponent } from './resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component';
 import { GroupSearchBoxComponent } from './resource-policies/form/eperson-group-list/group-search-box/group-search-box.component';
+import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
+import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -386,7 +390,9 @@ const COMPONENTS = [
   ResourcePolicyFormComponent,
   EpersonGroupListComponent,
   EpersonSearchBoxComponent,
-  GroupSearchBoxComponent
+  GroupSearchBoxComponent,
+  FileDownloadLinkComponent,
+  CollectionDropdownComponent
 ];
 
 const ENTRY_COMPONENTS = [
@@ -459,7 +465,8 @@ const ENTRY_COMPONENTS = [
   ClaimedTaskActionsApproveComponent,
   ClaimedTaskActionsRejectComponent,
   ClaimedTaskActionsReturnToPoolComponent,
-  ClaimedTaskActionsEditMetadataComponent
+  ClaimedTaskActionsEditMetadataComponent,
+  FileDownloadLinkComponent,
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [
@@ -491,6 +498,9 @@ const DIRECTIVES = [
   MetadataRepresentationDirective,
   ListableObjectDirective,
   ClaimedTaskActionsDirective,
+  FileValueAccessorDirective,
+  FileValidator,
+  ClaimedTaskActionsDirective,
   NgForTrackByIdDirective
 ];
 
@@ -504,8 +514,7 @@ const DIRECTIVES = [
     ...COMPONENTS,
     ...DIRECTIVES,
     ...ENTRY_COMPONENTS,
-    ...SHARED_ITEM_PAGE_COMPONENTS,
-
+    ...SHARED_ITEM_PAGE_COMPONENTS
   ],
   providers: [
     ...PROVIDERS
diff --git a/src/app/shared/testing/auth-request-service.stub.ts b/src/app/shared/testing/auth-request-service.stub.ts
index 1dc04380df..671c9237bf 100644
--- a/src/app/shared/testing/auth-request-service.stub.ts
+++ b/src/app/shared/testing/auth-request-service.stub.ts
@@ -9,6 +9,7 @@ import { EPersonMock } from './eperson.mock';
 export class AuthRequestServiceStub {
   protected mockUser: EPerson = EPersonMock;
   protected mockTokenInfo = new AuthTokenInfo('test_token');
+  protected mockShortLivedToken = 'test-shortlived-token';
 
   public postToEndpoint(method: string, body: any, options?: HttpOptions): Observable<any> {
     const authStatusStub: AuthStatus = new AuthStatus();
@@ -82,4 +83,8 @@ export class AuthRequestServiceStub {
     }
     return obj;
   }
+
+  public getShortlivedToken() {
+    return observableOf(this.mockShortLivedToken);
+  }
 }
diff --git a/src/app/shared/testing/test-module.ts b/src/app/shared/testing/test-module.ts
index b2129435da..6721e3042b 100644
--- a/src/app/shared/testing/test-module.ts
+++ b/src/app/shared/testing/test-module.ts
@@ -22,7 +22,11 @@ import { RouterLinkDirectiveStub } from './router-link-directive.stub';
     MySimpleItemActionComponent,
     RouterLinkDirectiveStub,
     NgComponentOutletDirectiveStub
-  ], schemas: [
+  ],
+  exports: [
+    QueryParamsDirectiveStub
+  ],
+  schemas: [
     CUSTOM_ELEMENTS_SCHEMA
   ]
 })
diff --git a/src/app/shared/utils/file-size-pipe.ts b/src/app/shared/utils/file-size-pipe.ts
index a796edb073..2d219cdaf4 100644
--- a/src/app/shared/utils/file-size-pipe.ts
+++ b/src/app/shared/utils/file-size-pipe.ts
@@ -1,4 +1,5 @@
 import { Pipe, PipeTransform } from '@angular/core';
+import * as fileSize from 'filesize';
 
 /*
  * Convert bytes into largest possible unit.
@@ -12,30 +13,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({ name: 'dsFileSize' })
 export class FileSizePipe implements PipeTransform {
-
-  private units: string[] = [
-    'bytes',
-    'KiB',
-    'MiB',
-    'GiB',
-    'TiB',
-    'PiB'
-  ];
-
   transform(bytes: number = 0, precision: number = 2): string {
-    let result: string;
-    if (isNaN(parseFloat(String(bytes))) || !isFinite(bytes)) {
-      result = '?';
-    } else {
-      let unit = 0;
-
-      while (bytes >= 1024) {
-        bytes /= 1024;
-        unit++;
-      }
-
-      result = bytes.toFixed(+ precision) + ' ' + this.units[unit];
-    }
-    return result;
+    return fileSize(bytes, { standard: 'jedec', round: precision });
   }
 }
diff --git a/src/app/shared/utils/file-value-accessor.directive.ts b/src/app/shared/utils/file-value-accessor.directive.ts
new file mode 100644
index 0000000000..bcd3381329
--- /dev/null
+++ b/src/app/shared/utils/file-value-accessor.directive.ts
@@ -0,0 +1,27 @@
+import {Directive} from '@angular/core';
+import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
+
+@Directive({
+    // tslint:disable-next-line:directive-selector
+    selector: 'input[type=file]',
+    // tslint:disable-next-line:no-host-metadata-property
+    host : {
+        '(change)' : 'onChange($event.target.files)',
+        '(blur)': 'onTouched()'
+    },
+    providers: [
+        { provide: NG_VALUE_ACCESSOR, useExisting: FileValueAccessorDirective, multi: true }
+    ]
+})
+/**
+ * Value accessor directive for inputs of type 'file'
+ */
+export class FileValueAccessorDirective implements ControlValueAccessor {
+    value: any;
+    onChange = (_) => { /* empty */ };
+    onTouched = () => { /* empty */};
+
+    writeValue(value) { /* empty */}
+    registerOnChange(fn: any) { this.onChange = fn; }
+    registerOnTouched(fn: any) { this.onTouched = fn; }
+}
diff --git a/src/app/shared/utils/require-file.validator.ts b/src/app/shared/utils/require-file.validator.ts
new file mode 100644
index 0000000000..9fa89c4188
--- /dev/null
+++ b/src/app/shared/utils/require-file.validator.ts
@@ -0,0 +1,22 @@
+import {Directive} from '@angular/core';
+import {NG_VALIDATORS, Validator, FormControl} from '@angular/forms';
+
+@Directive({
+  // tslint:disable-next-line:directive-selector
+    selector: '[requireFile]',
+    providers: [
+        { provide: NG_VALIDATORS, useExisting: FileValidator, multi: true },
+    ]
+})
+/**
+ * Validator directive to validate if a file is selected
+ */
+export class FileValidator implements Validator {
+    static validate(c: FormControl): {[key: string]: any} {
+      return c.value == null || c.value.length === 0 ? { required : true } : null;
+    }
+
+    validate(c: FormControl): {[key: string]: any} {
+      return FileValidator.validate(c);
+    }
+}
diff --git a/src/app/shared/utils/route.utils.ts b/src/app/shared/utils/route.utils.ts
index 6510fb8894..f43204930d 100644
--- a/src/app/shared/utils/route.utils.ts
+++ b/src/app/shared/utils/route.utils.ts
@@ -1,4 +1,6 @@
-import { Router } from '@angular/router';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { hasValue } from '../empty.util';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
 
 /**
  * Util function to retrieve the current path (without query parameters) the user is on
@@ -8,3 +10,11 @@ export function currentPath(router: Router) {
   const urlTree = router.parseUrl(router.url);
   return '/' + urlTree.root.children.primary.segments.map((it) => it.path).join('/')
 }
+
+export function currentPathFromSnapshot(route: ActivatedRouteSnapshot): string {
+  if (hasValue(route.parent)) {
+    const parentRoute: string = currentPathFromSnapshot(route.parent);
+    return new URLCombiner(parentRoute, route.routeConfig.path).toString();
+  }
+  return route.routeConfig ? route.routeConfig.path : '';
+}
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 6f4a8a864c..d897cc31fd 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -1,5 +1,20 @@
 <div>
-  <div ngbDropdown #collectionControls="ngbDropdown" class="btn-group input-group" (openChange)="toggled($event)">
+  <div
+    *ngIf="!(available$ | async)"
+    class="input-group mb-3">
+    <div class="input-group-prepend">
+      <span class="input-group-text">{{ 'submission.sections.general.collection' | translate }}</span>
+    </div>
+    <div class="input-group-append">
+      <span class="input-group-text">{{ selectedCollectionName$ | async }}</span>
+    </div>
+  </div>
+  <div
+    ngbDropdown
+    #collectionControls="ngbDropdown"
+    *ngIf="(available$ | async)"
+    class="btn-group input-group"
+    (openChange)="toggled($event)">
     <div class="input-group-prepend">
       <span id="collectionControlsMenuLabel" class="input-group-text">
         {{ 'submission.sections.general.collection' | translate }}
@@ -10,7 +25,7 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [disabled]="(disabled$ | async) || (processingChange$ | async)"
+            [disabled]="(processingChange$ | async)"
             ngbDropdownToggle>
       <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
       <span *ngIf="!(processingChange$ | async)">{{ selectedCollectionName$ | async }}</span>
@@ -20,31 +35,9 @@
          class="dropdown-menu"
          id="collectionControlsDropdownMenu"
          aria-labelledby="collectionControlsMenuButton">
-      <div class="form-group w-100 pr-2 pl-2">
-        <input *ngIf="searchField"
-               type="search"
-               class="form-control w-100"
-               (click)="$event.stopPropagation();"
-               placeholder="{{ 'submission.sections.general.search-collection' | translate }}"
-               [formControl]="searchField">
-      </div>
-      <div class="dropdown-divider"></div>
-      <div class="scrollable-menu" aria-labelledby="dropdownMenuButton" (scroll)="onScroll($event)">
-        <button class="dropdown-item disabled" *ngIf="(searchListCollection$ | async)?.length == 0">
-          {{'submission.sections.general.no-collection' | translate}}
-        </button>
-        <button *ngFor="let listItem of (searchListCollection$ | async)"
-                class="dropdown-item collection-item"
-                title="{{ listItem.collection.name }}"
-                (click)="onSelect(listItem)">
-          <ul class="list-unstyled mb-0">
-            <li class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities">
-              {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
-            </li>
-            <li class="list-item text-truncate text-primary font-weight-bold">{{ listItem.collection.name}}</li>
-          </ul>
-        </button>
-      </div>
+      <ds-collection-dropdown
+        (selectionChange)="onSelect($event)">
+      </ds-collection-dropdown>
     </div>
   </div>
 </div>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index 105d94b966..0132289266 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -1,14 +1,11 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement, SimpleChange } from '@angular/core';
+import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
 import { async, ComponentFixture, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
-import { of as observableOf } from 'rxjs';
-import { filter } from 'rxjs/operators';
 import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
-import { cold } from 'jasmine-marbles';
 
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
 import { mockSubmissionId, mockSubmissionRestResponse } from '../../../shared/mocks/submission.mock';
@@ -19,172 +16,13 @@ import { SubmissionJsonPatchOperationsService } from '../../../core/submission/s
 import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Community } from '../../../core/shared/community.model';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { Collection } from '../../../core/shared/collection.model';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
-
-const subcommunities = [Object.assign(new Community(), {
-  name: 'SubCommunity 1',
-  id: '123456789-1',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'SubCommunity 1'
-    }]
-}),
-  Object.assign(new Community(), {
-    name: 'SubCommunity 1',
-    id: '123456789s-1',
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'SubCommunity 1'
-      }]
-  })
-];
-
-const mockCommunity1Collection1 = Object.assign(new Collection(), {
-  name: 'Community 1-Collection 1',
-  id: '1234567890-1',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 1-Collection 1'
-    }]
-});
-
-const mockCommunity1Collection2 = Object.assign(new Collection(), {
-  name: 'Community 1-Collection 2',
-  id: '1234567890-2',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 1-Collection 2'
-    }]
-});
-
-const mockCommunity2Collection1 = Object.assign(new Collection(), {
-  name: 'Community 2-Collection 1',
-  id: '1234567890-3',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 2-Collection 1'
-    }]
-});
-
-const mockCommunity2Collection2 = Object.assign(new Collection(), {
-  name: 'Community 2-Collection 2',
-  id: '1234567890-4',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 2-Collection 2'
-    }]
-});
-
-const mockCommunity = Object.assign(new Community(), {
-  name: 'Community 1',
-  id: '123456789-1',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 1'
-    }],
-  collections: observableOf(new RemoteData(true, true, true,
-    undefined, new PaginatedList(new PageInfo(), [mockCommunity1Collection1, mockCommunity1Collection2]))),
-  subcommunities: observableOf(new RemoteData(true, true, true,
-    undefined, new PaginatedList(new PageInfo(), subcommunities))),
-});
-
-const mockCommunity2 = Object.assign(new Community(), {
-  name: 'Community 2',
-  id: '123456789-2',
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Community 2'
-    }],
-  collections: observableOf(new RemoteData(true, true, true,
-    undefined, new PaginatedList(new PageInfo(), [mockCommunity2Collection1, mockCommunity2Collection2]))),
-  subcommunities: observableOf(new RemoteData(true, true, true,
-    undefined, new PaginatedList(new PageInfo(), []))),
-});
-
-const mockCommunity1Collection1Rd = observableOf(new RemoteData(true, true, true,
-  undefined, mockCommunity1Collection1));
-
-const mockCommunityList = observableOf(new RemoteData(true, true, true,
-  undefined, new PaginatedList(new PageInfo(), [mockCommunity, mockCommunity2])));
-
-const mockCommunityCollectionList = observableOf(new RemoteData(true, true, true,
-  undefined, new PaginatedList(new PageInfo(), [mockCommunity1Collection1, mockCommunity1Collection2])));
-
-const mockCommunity2CollectionList = observableOf(new RemoteData(true, true, true,
-  undefined, new PaginatedList(new PageInfo(), [mockCommunity2Collection1, mockCommunity2Collection2])));
-
-const mockCollectionList = [
-  {
-    communities: [
-      {
-        id: '123456789-1',
-        name: 'Community 1'
-      }
-    ],
-    collection: {
-      id: '1234567890-1',
-      name: 'Community 1-Collection 1'
-    }
-  },
-  {
-    communities: [
-      {
-        id: '123456789-1',
-        name: 'Community 1'
-      }
-    ],
-    collection: {
-      id: '1234567890-2',
-      name: 'Community 1-Collection 2'
-    }
-  },
-  {
-    communities: [
-      {
-        id: '123456789-2',
-        name: 'Community 2'
-      }
-    ],
-    collection: {
-      id: '1234567890-3',
-      name: 'Community 2-Collection 1'
-    }
-  },
-  {
-    communities: [
-      {
-        id: '123456789-2',
-        name: 'Community 2'
-      }
-    ],
-    collection: {
-      id: '1234567890-4',
-      name: 'Community 2-Collection 2'
-    }
-  }
-];
+import { hot, cold } from 'jasmine-marbles';
+import { of } from 'rxjs';
+import { SectionsService } from '../../sections/sections.service';
+import { componentFactoryName } from '@angular/compiler';
+import { Collection } from 'src/app/core/shared/collection.model';
 
 describe('SubmissionFormCollectionComponent Component', () => {
 
@@ -198,7 +36,57 @@ describe('SubmissionFormCollectionComponent Component', () => {
   const collectionId = '1234567890-1';
   const definition = 'traditional';
   const submissionRestResponse = mockSubmissionRestResponse;
-  const searchedCollection = 'Community 2-Collection 2';
+
+  const mockCollectionList = [
+    {
+      communities: [
+        {
+          id: '123456789-1',
+          name: 'Community 1'
+        }
+      ],
+      collection: {
+        id: '1234567890-1',
+        name: 'Community 1-Collection 1'
+      }
+    },
+    {
+      communities: [
+        {
+          id: '123456789-1',
+          name: 'Community 1'
+        }
+      ],
+      collection: {
+        id: '1234567890-2',
+        name: 'Community 1-Collection 2'
+      }
+    },
+    {
+      communities: [
+        {
+          id: '123456789-2',
+          name: 'Community 2'
+        }
+      ],
+      collection: {
+        id: '1234567890-3',
+        name: 'Community 2-Collection 1'
+      }
+    },
+    {
+      communities: [
+        {
+          id: '123456789-2',
+          name: 'Community 2'
+        }
+      ],
+      collection: {
+        id: '1234567890-4',
+        name: 'Community 2-Collection 2'
+      }
+    }
+  ];
 
   const communityDataService: any = jasmine.createSpyObj('communityDataService', {
     findAll: jasmine.createSpy('findAll')
@@ -217,6 +105,10 @@ describe('SubmissionFormCollectionComponent Component', () => {
     replace: jasmine.createSpy('replace')
   });
 
+  const sectionsService: any = jasmine.createSpyObj('sectionsService', {
+    isSectionAvailable: of(true)
+  });
+
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
@@ -236,6 +128,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
         { provide: CommunityDataService, useValue: communityDataService },
         { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
         { provide: Store, useValue: store },
+        { provide: SectionsService, useValue: sectionsService },
         ChangeDetectorRef,
         SubmissionFormCollectionComponent
       ],
@@ -299,72 +192,11 @@ describe('SubmissionFormCollectionComponent Component', () => {
       expect(compAsAny.pathCombiner).toEqual(expected);
     });
 
-    it('should init collection list properly', () => {
-      communityDataService.findAll.and.returnValue(mockCommunityList);
-      collectionDataService.findById.and.returnValue(mockCommunity1Collection1Rd);
-      collectionDataService.getAuthorizedCollectionByCommunity.and.returnValues(mockCommunityCollectionList, mockCommunity2CollectionList);
-
-      comp.ngOnChanges({
-        currentCollectionId: new SimpleChange(null, collectionId, true)
-      });
-
-      expect(comp.searchListCollection$).toBeObservable(cold('(ab)', {
-        a: [],
-        b: mockCollectionList
-      }));
-
-      expect(comp.selectedCollectionName$).toBeObservable(cold('(a|)', {
-        a: 'Community 1-Collection 1'
-      }));
-    });
-
-    it('should show only the searched collection', () => {
-      comp.searchListCollection$ = observableOf(mockCollectionList);
-      fixture.detectChanges();
-
-      comp.searchField.setValue(searchedCollection);
-      fixture.detectChanges();
-
-      comp.searchListCollection$.pipe(
-        filter(() => !comp.disabled$.getValue())
-      ).subscribe((list) => {
-        expect(list).toEqual([mockCollectionList[3]]);
-      });
-
-    });
-
-    it('should emit collectionChange event when selecting a new collection', () => {
-      spyOn(comp.searchField, 'reset').and.callThrough();
-      spyOn(comp.collectionChange, 'emit').and.callThrough();
-      jsonPatchOpServiceStub.jsonPatchByResourceID.and.returnValue(observableOf(submissionRestResponse));
-      comp.ngOnInit();
-      comp.onSelect(mockCollectionList[1]);
-      fixture.detectChanges();
-
-      expect(comp.searchField.reset).toHaveBeenCalled();
-      expect(comp.collectionChange.emit).toHaveBeenCalledWith(submissionRestResponse[0] as any);
-      expect(submissionServiceStub.changeSubmissionCollection).toHaveBeenCalled();
-      expect(comp.selectedCollectionId).toBe(mockCollectionList[1].collection.id);
-      expect(comp.selectedCollectionName$).toBeObservable(cold('(a|)', {
-        a: mockCollectionList[1].collection.name
-      }));
-
-    });
-
-    it('should reset searchField when dropdown menu has been closed', () => {
-      spyOn(comp.searchField, 'reset').and.callThrough();
-      comp.toggled(false);
-
-      expect(comp.searchField.reset).toHaveBeenCalled();
-    });
-
     describe('', () => {
       let dropdowBtn: DebugElement;
       let dropdownMenu: DebugElement;
 
       beforeEach(() => {
-
-        comp.searchListCollection$ = observableOf(mockCollectionList);
         fixture.detectChanges();
         dropdowBtn = fixture.debugElement.query(By.css('#collectionControlsMenuButton'));
         dropdownMenu = fixture.debugElement.query(By.css('#collectionControlsDropdownMenu'));
@@ -387,49 +219,46 @@ describe('SubmissionFormCollectionComponent Component', () => {
         fixture.whenStable().then(() => {
           expect(comp.onClose).toHaveBeenCalled();
           expect(dropdownMenu.nativeElement.classList).toContain('show');
-          expect(dropdownMenu.queryAll(By.css('.collection-item')).length).toBe(4);
         });
       }));
 
-      it('should trigger onSelect method when select a new collection from dropdown menu', fakeAsync(() => {
+      it('the dropdown menu should be enable', () => {
+        const dropDown = fixture.debugElement.query(By.css('#collectionControlsDropdownMenu'));
+        expect(dropDown).toBeTruthy();
+      });
 
-        spyOn(comp, 'onSelect');
-        dropdowBtn.triggerEventHandler('click', null);
-        tick();
+      it('the dropdown menu should be disabled', () => {
+        comp.available$ = of(false);
+        fixture.detectChanges();
+        const dropDown = fixture.debugElement.query(By.css('#collectionControlsDropdownMenu'));
+        expect(dropDown).toBeFalsy();
+      });
+
+      it('should be simulated when the drop-down menu is closed', () => {
+        spyOn(comp, 'onClose');
+        comp.onClose();
+        expect(comp.onClose).toHaveBeenCalled();
+      });
+
+      it('should be simulated when the drop-down menu is toggled', () => {
+        spyOn(comp, 'toggled');
+        comp.toggled(false);
+        expect(comp.toggled).toHaveBeenCalled();
+      });
+
+      it('should ', () => {
+        spyOn(comp.collectionChange, 'emit').and.callThrough();
+        jsonPatchOpServiceStub.jsonPatchByResourceID.and.returnValue(of(submissionRestResponse));
+        comp.ngOnInit();
+        comp.onSelect(mockCollectionList[1]);
         fixture.detectChanges();
 
-        const secondLink: DebugElement = dropdownMenu.query(By.css('.collection-item:nth-child(2)'));
-        secondLink.triggerEventHandler('click', null);
-        tick();
-        fixture.detectChanges();
-
-        fixture.whenStable().then(() => {
-
-          expect(comp.onSelect).toHaveBeenCalled();
-        });
-      }));
-
-      it('should update searchField on input type', fakeAsync(() => {
-
-        dropdowBtn.triggerEventHandler('click', null);
-        tick();
-        fixture.detectChanges();
-
-        fixture.whenStable().then(() => {
-          const input = fixture.debugElement.query(By.css('input.form-control'));
-          const el = input.nativeElement;
-
-          expect(el.value).toBe('');
-
-          el.value = searchedCollection;
-          el.dispatchEvent(new Event('input'));
-
-          fixture.detectChanges();
-
-          expect(fixture.componentInstance.searchField.value).toEqual(searchedCollection);
-        });
-      }));
-
+        expect(submissionServiceStub.changeSubmissionCollection).toHaveBeenCalled();
+        expect(comp.selectedCollectionId).toBe(mockCollectionList[1].collection.id);
+        expect(comp.selectedCollectionName$).toBeObservable(cold('(a|)', {
+          a: mockCollectionList[1].collection.name
+        }));
+      });
     });
 
   });
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index f84764d6a4..aa1bf9cb0a 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -2,57 +2,31 @@ import {
   ChangeDetectorRef,
   Component,
   EventEmitter,
-  HostListener,
   Input,
   OnChanges,
   OnInit,
   Output,
-  SimpleChanges
+  SimpleChanges,
+  ViewChild
 } from '@angular/core';
-import { FormControl } from '@angular/forms';
 
-import { BehaviorSubject, combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
 import {
-  debounceTime,
-  distinctUntilChanged,
-  filter,
   find,
-  flatMap,
-  map,
-  mergeMap,
-  reduce,
-  startWith
+  map
 } from 'rxjs/operators';
 
 import { Collection } from '../../../core/shared/collection.model';
-import { CommunityDataService } from '../../../core/data/community-data.service';
-import { Community } from '../../../core/shared/community.model';
-import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { PaginatedList } from '../../../core/data/paginated-list';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { FindListOptions } from '../../../core/data/request.models';
-
-/**
- * An interface to represent a collection entry
- */
-interface CollectionListEntryItem {
-  id: string;
-  name: string;
-}
-
-/**
- * An interface to represent an entry in the collection list
- */
-interface CollectionListEntry {
-  communities: CollectionListEntryItem[],
-  collection: CollectionListEntryItem
-}
+import { CollectionDropdownComponent } from 'src/app/shared/collection-dropdown/collection-dropdown.component';
+import { SectionsService } from '../../sections/sections.service';
 
 /**
  * This component allows to show the current collection the submission belonging to and to change it.
@@ -88,30 +62,12 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   @Output() collectionChange: EventEmitter<SubmissionObject> = new EventEmitter<SubmissionObject>();
 
-  /**
-   * A boolean representing if this dropdown button is disabled
-   * @type {BehaviorSubject<boolean>}
-   */
-  public disabled$ = new BehaviorSubject<boolean>(true);
-
   /**
    * A boolean representing if a collection change operation is processing
    * @type {BehaviorSubject<boolean>}
    */
   public processingChange$ = new BehaviorSubject<boolean>(false);
 
-  /**
-   * The search form control
-   * @type {FormControl}
-   */
-  public searchField: FormControl = new FormControl();
-
-  /**
-   * The collection list obtained from a search
-   * @type {Observable<CollectionListEntry[]>}
-   */
-  public searchListCollection$: Observable<CollectionListEntry[]>;
-
   /**
    * The selected collection id
    * @type {string}
@@ -130,24 +86,23 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   protected pathCombiner: JsonPatchOperationPathCombiner;
 
-  /**
-   * A boolean representing if dropdown list is scrollable to the bottom
-   * @type {boolean}
-   */
-  private scrollableBottom = false;
-
-  /**
-   * A boolean representing if dropdown list is scrollable to the top
-   * @type {boolean}
-   */
-  private scrollableTop = false;
-
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    * @type {Array}
    */
   private subs: Subscription[] = [];
 
+  /**
+   * The html child that contains the collections list
+   */
+  @ViewChild(CollectionDropdownComponent, {static: false}) collectionDropdown: CollectionDropdownComponent;
+
+  /**
+   * A boolean representing if the collection section is available
+   * @type {BehaviorSubject<boolean>}
+   */
+  available$: Observable<boolean>;
+
   /**
    * Initialize instance variables
    *
@@ -159,37 +114,11 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    * @param {SubmissionService} submissionService
    */
   constructor(protected cdr: ChangeDetectorRef,
-              private communityDataService: CommunityDataService,
               private collectionDataService: CollectionDataService,
               private operationsBuilder: JsonPatchOperationsBuilder,
               private operationsService: SubmissionJsonPatchOperationsService,
-              private submissionService: SubmissionService) {
-  }
-
-  /**
-   * Method called on mousewheel event, it prevent the page scroll
-   * when arriving at the top/bottom of dropdown menu
-   *
-   * @param event
-   *     mousewheel event
-   */
-  @HostListener('mousewheel', ['$event']) onMousewheel(event) {
-    if (event.wheelDelta > 0 && this.scrollableTop) {
-      event.preventDefault();
-    }
-    if (event.wheelDelta < 0 && this.scrollableBottom) {
-      event.preventDefault();
-    }
-  }
-
-  /**
-   * Check if dropdown scrollbar is at the top or bottom of the dropdown list
-   *
-   * @param event
-   */
-  onScroll(event) {
-    this.scrollableBottom = (event.target.scrollTop + event.target.clientHeight === event.target.scrollHeight);
-    this.scrollableTop = (event.target.scrollTop === 0);
+              private submissionService: SubmissionService,
+              private sectionsService: SectionsService) {
   }
 
   /**
@@ -204,51 +133,6 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
         find((collectionRD: RemoteData<Collection>) => isNotEmpty(collectionRD.payload)),
         map((collectionRD: RemoteData<Collection>) => collectionRD.payload.name)
       );
-
-      const findOptions: FindListOptions = {
-        elementsPerPage: 1000
-      };
-
-      // Retrieve collection list only when is the first change
-      if (changes.currentCollectionId.isFirstChange()) {
-        // @TODO replace with search/top browse endpoint
-        // @TODO implement community/subcommunity hierarchy
-        const communities$ = this.communityDataService.findAll(findOptions).pipe(
-          find((communities: RemoteData<PaginatedList<Community>>) => isNotEmpty(communities.payload)),
-          mergeMap((communities: RemoteData<PaginatedList<Community>>) => communities.payload.page));
-
-        const listCollection$ = communities$.pipe(
-          flatMap((communityData: Community) => {
-            return this.collectionDataService.getAuthorizedCollectionByCommunity(communityData.uuid, findOptions).pipe(
-              find((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending && collections.hasSucceeded),
-              mergeMap((collections: RemoteData<PaginatedList<Collection>>) => collections.payload.page),
-              filter((collectionData: Collection) => isNotEmpty(collectionData)),
-              map((collectionData: Collection) => ({
-                communities: [{ id: communityData.id, name: communityData.name }],
-                collection: { id: collectionData.id, name: collectionData.name }
-              }))
-            );
-          }),
-          reduce((acc: any, value: any) => [...acc, ...value], []),
-          startWith([])
-        );
-
-        const searchTerm$ = this.searchField.valueChanges.pipe(
-          debounceTime(200),
-          distinctUntilChanged(),
-          startWith('')
-        );
-
-        this.searchListCollection$ = combineLatest(searchTerm$, listCollection$).pipe(
-          map(([searchTerm, listCollection]) => {
-            this.disabled$.next(isEmpty(listCollection));
-            if (isEmpty(searchTerm)) {
-              return listCollection;
-            } else {
-              return listCollection.filter((v) => v.collection.name.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1).slice(0, 5);
-            }
-          }));
-      }
     }
   }
 
@@ -257,6 +141,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   ngOnInit() {
     this.pathCombiner = new JsonPatchOperationPathCombiner('sections', 'collection');
+    this.available$ = this.sectionsService.isSectionAvailable(this.submissionId, 'collection');
   }
 
   /**
@@ -273,7 +158,6 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    *    the selected [CollectionListEntryItem]
    */
   onSelect(event) {
-    this.searchField.reset();
     this.processingChange$.next(true);
     this.operationsBuilder.replace(this.pathCombiner.getPath(), event.collection.id, true);
     this.subs.push(this.operationsService.jsonPatchByResourceID(
@@ -296,7 +180,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    * Reset search form control on dropdown menu close
    */
   onClose() {
-    this.searchField.reset();
+    this.collectionDropdown.reset();
   }
 
   /**
@@ -307,7 +191,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   toggled(isOpen: boolean) {
     if (!isOpen) {
-      this.searchField.reset();
+      this.collectionDropdown.reset();
     }
   }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4173fa1cf2..9f3d47dcde 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -8,6 +8,10 @@
 
 
 
+  "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+
   "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
 
   "admin.registries.bitstream-formats.create.failure.head": "Failure",
@@ -30,6 +34,8 @@
 
   "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
 
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+
   "admin.registries.bitstream-formats.edit.description.hint": "",
 
   "admin.registries.bitstream-formats.edit.description.label": "Description",
@@ -94,6 +100,8 @@
 
 
 
+  "admin.registries.metadata.breadcrumbs": "Metadata registry",
+
   "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
 
   "admin.registries.metadata.form.create": "Create metadata schema",
@@ -120,6 +128,8 @@
 
 
 
+  "admin.registries.schema.breadcrumbs": "Metadata schema",
+
   "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
 
   "admin.registries.schema.fields.head": "Schema metadata fields",
@@ -767,6 +777,10 @@
 
   "community.edit.notifications.success": "Successfully edited the Community",
 
+  "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+
+  "community.edit.notifications.error": "An error occured while editing the Community",
+
   "community.edit.return": "Return",
 
 
@@ -934,6 +948,62 @@
   "footer.link.duraspace": "DuraSpace",
 
 
+  "forgot-email.form.header": "Forgot Password",
+
+  "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+
+  "forgot-email.form.email": "Email Address *",
+
+  "forgot-email.form.email.error.required": "Please fill in an email address",
+
+  "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+
+  "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+
+  "forgot-email.form.submit": "Submit",
+
+  "forgot-email.form.success.head": "Verification email sent",
+
+  "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+
+  "forgot-email.form.error.head": "Error when trying to register email",
+
+  "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
+
+
+
+  "forgot-password.title": "Forgot Password",
+
+  "forgot-password.form.head": "Forgot Password",
+
+  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+
+  "forgot-password.form.card.security": "Security",
+
+  "forgot-password.form.identification.header": "Identify",
+
+  "forgot-password.form.identification.email": "Email address: ",
+
+  "forgot-password.form.label.password": "Password",
+
+  "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+
+  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+
+  "forgot-password.form.error.matching-passwords": "The passwords do not match.",
+
+  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+
+  "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+
+  "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
+
+  "forgot-password.form.notification.success.title": "Password reset completed",
+
+  "forgot-password.form.submit": "Submit password",
+
+
+
   "form.add": "Add",
 
   "form.add-help": "Click here to add the current entry and to add another one",
@@ -1663,6 +1733,8 @@
 
   "menu.section.icon.pin": "Pin sidebar",
 
+  "menu.section.icon.processes": "Processes menu section",
+
   "menu.section.icon.registries": "Registries menu section",
 
   "menu.section.icon.statistics_task": "Statistics Task menu section",
@@ -1689,6 +1761,8 @@
 
   "menu.section.new_item_version": "Item Version",
 
+  "menu.section.new_process": "Process",
+
 
 
   "menu.section.pin": "Pin sidebar",
@@ -1697,6 +1771,10 @@
 
 
 
+  "menu.section.processes": "Processes",
+
+
+
   "menu.section.registries": "Registries",
 
   "menu.section.registries_format": "Format",
@@ -1737,7 +1815,7 @@
 
   "mydspace.description": "",
 
-  "mydspace.general.text-here": "HERE",
+  "mydspace.general.text-here": "here",
 
   "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
 
@@ -1885,6 +1963,93 @@
 
 
 
+  "process.new.select-parameters": "Parameters",
+
+  "process.new.cancel": "Cancel",
+
+  "process.new.submit": "Submit",
+
+  "process.new.select-script": "Script",
+
+  "process.new.select-script.placeholder": "Choose a script...",
+
+  "process.new.select-script.required": "Script is required",
+
+  "process.new.parameter.file.upload-button": "Select file...",
+
+  "process.new.parameter.file.required": "Please select a file",
+
+  "process.new.parameter.string.required": "Parameter value is required",
+
+  "process.new.parameter.type.value": "value",
+
+  "process.new.parameter.type.file": "file",
+
+  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+
+  "process.new.notification.success.title": "Success",
+
+  "process.new.notification.success.content": "The process was successfully created",
+
+  "process.new.notification.error.title": "Error",
+
+  "process.new.notification.error.content": "An error occurred while creating this process",
+
+  "process.new.header": "Create a new process",
+
+  "process.new.title": "Create a new process",
+
+  "process.new.breadcrumbs": "Create a new process",
+
+
+
+  "process.detail.arguments" : "Arguments",
+
+  "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+
+  "process.detail.back" : "Back",
+
+  "process.detail.output" : "Process Output",
+
+  "process.detail.output.alert" : "Work in progress - Process output is not available yet",
+
+  "process.detail.output-files" : "Output Files",
+
+  "process.detail.output-files.empty" : "This process doesn't contain any output files",
+
+  "process.detail.script" : "Script",
+
+  "process.detail.title" : "Process: {{ id }} - {{ name }}",
+
+  "process.detail.start-time" : "Start time",
+
+  "process.detail.end-time" : "Finish time",
+
+  "process.detail.status" : "Status",
+
+  "process.detail.create" : "Create similar process",
+
+
+
+  "process.overview.table.finish" : "Finish time",
+
+  "process.overview.table.id" : "Process ID",
+
+  "process.overview.table.name" : "Name",
+
+  "process.overview.table.start" : "Start time",
+
+  "process.overview.table.status" : "Status",
+
+  "process.overview.table.user" : "User",
+
+  "process.overview.title": "Processes Overview",
+
+  "process.overview.breadcrumbs": "Processes Overview",
+
+  "process.overview.new": "New",
+
+
   "profile.breadcrumbs": "Update Profile",
 
   "profile.card.identify": "Identify",
@@ -2042,6 +2207,74 @@
   "publication.search.title": "DSpace Angular :: Publication Search",
 
 
+  "register-email.title": "New user registration",
+
+  "register-page.create-profile.header": "Create Profile",
+
+  "register-page.create-profile.identification.header": "Identify",
+
+  "register-page.create-profile.identification.email": "Email Address",
+
+  "register-page.create-profile.identification.first-name": "First Name *",
+
+  "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+
+  "register-page.create-profile.identification.last-name": "Last Name *",
+
+  "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+
+  "register-page.create-profile.identification.contact": "Contact Telephone",
+
+  "register-page.create-profile.identification.language": "Language",
+
+  "register-page.create-profile.security.header": "Security",
+
+  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
+
+  "register-page.create-profile.security.label.password": "Password *",
+
+  "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+
+  "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+
+  "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
+
+  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
+
+  "register-page.create-profile.submit": "Complete Registration",
+
+  "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+
+  "register-page.create-profile.submit.error.head": "Registration failed",
+
+  "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
+
+  "register-page.create-profile.submit.success.head": "Registration completed",
+
+
+  "register-page.registration.header": "New user registration",
+
+  "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+
+  "register-page.registration.email": "Email Address *",
+
+  "register-page.registration.email.error.required": "Please fill in an email address",
+
+  "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+
+  "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+
+  "register-page.registration.submit": "Register",
+
+  "register-page.registration.success.head": "Verification email sent",
+
+  "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+
+  "register-page.registration.error.head": "Error when trying to register email",
+
+  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+
+
 
   "relationships.isAuthorOf": "Authors",
 
diff --git a/src/main.browser.ts b/src/main.browser.ts
index 783f6d7d06..5149014d88 100644
--- a/src/main.browser.ts
+++ b/src/main.browser.ts
@@ -50,3 +50,5 @@ if (hasValue(environment.universal) && environment.universal.preboot === false)
 } else {
   document.addEventListener('DOMContentLoaded', () => bootloader(main));
 }
+
+import 'zone.js/dist/zone';
diff --git a/src/polyfills.ts b/src/polyfills.ts
index ca40a803ba..151f4a4c45 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -52,11 +52,6 @@
  *
  */
 
-/***************************************************************************************************
- * Zone JS is required by default for Angular itself.
- */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */
@@ -64,4 +59,6 @@ import 'zone.js/dist/zone';  // Included with Angular CLI.
 import 'core-js/es';
 import 'core-js/features/reflect';
 
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
 import 'reflect-metadata';
diff --git a/yarn.lock b/yarn.lock
index 402f51a0e0..c48e53a226 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4309,6 +4309,11 @@ filesize@^3.6.1:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
   integrity sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==
 
+filesize@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.1.0.tgz#e81bdaa780e2451d714d71c0d7a4f3238d37ad00"
+  integrity sha512-LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg==
+
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -6808,10 +6813,12 @@ ng-mocks@^8.1.0:
   resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-8.1.0.tgz#d00a5e53ae53587f35c68147826590fab71a1658"
   integrity sha512-/314nyU6UrONCUKfvFRuJPLpNBxqocwJmQBlPy4he5Vueu6gObXjy+KLUlbbENuA7zTeBjp//RA6w/Fa1yQ4Fw==
 
-ng2-file-upload@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-1.2.1.tgz#5563c5dfd6f43fbfbe815c206e343464a0a6a197"
-  integrity sha1-VWPF39b0P7++gVwgbjQ0ZKCmoZc=
+ng2-file-upload@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-1.4.0.tgz#8dea28d573234c52af474ad2a4001b335271e5c4"
+  integrity sha512-3J/KPU/tyh/ad6TFeUbrxX+SihUj0iOEt2Zsg4EX7mB3GFiQscXOfcUOxCkBtPWWWaqt3azrYbVGzsYa3/7NzQ==
+  dependencies:
+    tslib "^1.9.0"
 
 ng2-nouislider@^1.8.2:
   version "1.8.2"
@@ -10953,9 +10960,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 when@~3.6.x:
   version "3.6.4"