diff --git a/src/app/features/admin-institutions/components/filters-section/filters-section.component.html b/src/app/features/admin-institutions/components/filters-section/filters-section.component.html
index b1c526da0..f8b04560e 100644
--- a/src/app/features/admin-institutions/components/filters-section/filters-section.component.html
+++ b/src/app/features/admin-institutions/components/filters-section/filters-section.component.html
@@ -17,7 +17,6 @@ <h2>{{ 'adminInstitutions.common.filterBy' | translate }}</h2>
           class="px-4"
           [filterValues]="filterValues()"
           [filters]="filters()"
-          [filterOptionsCache]="filterOptionsCache()"
           (filterRemoved)="onFilterChipRemoved($event)"
         />
 
diff --git a/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts b/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts
index 4e775de6f..060d01331 100644
--- a/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts
+++ b/src/app/features/admin-institutions/components/filters-section/filters-section.component.ts
@@ -45,7 +45,6 @@ export class FiltersSectionComponent {
   filters = select(GlobalSearchSelectors.getFilters);
   filterValues = select(GlobalSearchSelectors.getFilterValues);
   filterSearchCache = select(GlobalSearchSelectors.getFilterSearchCache);
-  filterOptionsCache = select(GlobalSearchSelectors.getFilterOptionsCache);
   areResourcesLoading = select(GlobalSearchSelectors.getResourcesLoading);
 
   onFilterChanged(event: { filterType: string; value: StringOrNull }): void {
diff --git a/src/app/features/moderation/constants/preprint-sort-options.const.ts b/src/app/features/moderation/constants/preprint-sort-options.const.ts
index 60dbe6cdb..3f1579f7b 100644
--- a/src/app/features/moderation/constants/preprint-sort-options.const.ts
+++ b/src/app/features/moderation/constants/preprint-sort-options.const.ts
@@ -13,10 +13,10 @@ export const PREPRINT_SORT_OPTIONS: CustomOption<string>[] = [
   },
   {
     value: PreprintSubmissionsSort.Newest,
-    label: 'moderation.sortOption.oldest',
+    label: 'moderation.sortOption.newest',
   },
   {
     value: PreprintSubmissionsSort.Oldest,
-    label: 'moderation.sortOption.newest',
+    label: 'moderation.sortOption.oldest',
   },
 ];
diff --git a/src/app/features/moderation/enums/preprint-submissions-sort.enum.ts b/src/app/features/moderation/enums/preprint-submissions-sort.enum.ts
index dbf6c5633..ca1f886f1 100644
--- a/src/app/features/moderation/enums/preprint-submissions-sort.enum.ts
+++ b/src/app/features/moderation/enums/preprint-submissions-sort.enum.ts
@@ -1,6 +1,6 @@
 export enum PreprintSubmissionsSort {
   TitleAZ = 'title',
   TitleZA = '-title',
-  Oldest = '-date_last_transitioned',
-  Newest = 'date_last_transitioned',
+  Oldest = 'date_last_transitioned',
+  Newest = '-date_last_transitioned',
 }
diff --git a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.html b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.html
index 673cdd165..ff9244f42 100644
--- a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.html
+++ b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.html
@@ -27,7 +27,18 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.authors' | translate
         <div class="flex flex-column gap-1 line-height-2 md:flex-row">
           @for (contributor of bibliographicContributors(); track contributor.id) {
             <div>
-              <a class="font-bold"> {{ contributor.fullName }}</a>
+              @if (contributor.isUnregisteredContributor) {
+                <span>{{ contributor.fullName }}</span>
+              } @else {
+                <a
+                  class="font-bold"
+                  [href]="`${webUrl}/${contributor.userId}`"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {{ contributor.fullName }}
+                </a>
+              }
               <span>{{ $last ? '' : ',' }}</span>
             </div>
           }
@@ -38,7 +49,6 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.authors' | translate
         </div>
       </section>
 
-      <!-- [RNi] TODO: Extract to separate component -->
       @if (preprintProvider()?.assertionsEnabled) {
         <section class="flex flex-column gap-2">
           <h3>{{ 'preprints.preprintStepper.review.sections.authorAssertions.conflictOfInterest' | translate }}</h3>
diff --git a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts
index df6933c9c..f7738f89d 100644
--- a/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts
+++ b/src/app/features/preprints/components/preprint-details/general-information/general-information.component.ts
@@ -45,7 +45,7 @@ export class GeneralInformationComponent implements OnDestroy {
     fetchPreprintById: FetchPreprintById,
     fetchResourceInstitutions: FetchResourceInstitutions,
   });
-  readonly environment = environment;
+  readonly webUrl = environment.webUrl;
 
   preprintProvider = input.required<PreprintProviderDetails | undefined>();
   preprintVersionSelected = output<string>();
diff --git a/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.html b/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.html
index fc9183d87..d42a94e53 100644
--- a/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.html
+++ b/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.html
@@ -41,15 +41,15 @@
     }
 
     @if (file()) {
-      @let fileValue = file()!;
+      @let preprintValue = preprint()!;
 
       <div class="flex flex-column gap-1 justify-content-start md:flex-row">
-        <span>{{ dateLabel() | translate }}: {{ fileValue.dateCreated | date: 'longDate' }}</span>
+        <span>{{ dateLabel() | translate }}: {{ preprintValue.dateCreated | date: 'longDate' }}</span>
         @if (isMedium() || isLarge()) {
           <span>|</span>
         }
         <span>
-          {{ 'preprints.details.file.lastEdited' | translate }} : {{ fileValue.dateModified | date: 'longDate' }}
+          {{ 'preprints.details.file.lastEdited' | translate }} : {{ preprintValue.dateModified | date: 'longDate' }}
         </span>
       </div>
     }
diff --git a/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.ts b/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.ts
index 43bc28fcb..03be07d64 100644
--- a/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.ts
+++ b/src/app/features/preprints/components/preprint-details/preprint-file-section/preprint-file-section.component.ts
@@ -36,6 +36,7 @@ export class PreprintFileSectionComponent {
   isMedium = toSignal(inject(IS_MEDIUM));
   isLarge = toSignal(inject(IS_LARGE));
 
+  preprint = select(PreprintSelectors.getPreprint);
   file = select(PreprintSelectors.getPreprintFile);
   preprint$ = toObservable(select(PreprintSelectors.getPreprint));
   isFileLoading = select(PreprintSelectors.isPreprintFileLoading);
@@ -58,10 +59,10 @@ export class PreprintFileSectionComponent {
     const fileVersions = this.fileVersions();
     if (!fileVersions.length) return [];
 
-    return fileVersions.map((version, index) => ({
+    return fileVersions.map((version) => ({
       label: this.translateService.instant('preprints.details.file.downloadVersion', {
-        version: ++index,
-        date: this.datePipe.transform(version.dateCreated, 'mm/dd/yyyy hh:mm:ss'),
+        version: version.id,
+        date: this.datePipe.transform(version.dateCreated, 'MM/dd/yyyy hh:mm:ss'),
       }),
       url: version.downloadLink,
       command: () => this.logDownload(),
diff --git a/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.html b/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.html
index 56b0e8d3a..be9ad3eb5 100644
--- a/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.html
+++ b/src/app/features/preprints/components/preprint-details/preprint-tombstone/preprint-tombstone.component.html
@@ -39,7 +39,6 @@ <h3>{{ 'preprints.preprintStepper.common.labels.abstract' | translate }}</h3>
       <section class="license flex flex-column gap-2">
         <h3>{{ 'preprints.preprintStepper.review.sections.metadata.license' | translate }}</h3>
 
-        <!-- [RNi] TODO: Extract to separate component -->
         <p-accordion>
           <p-accordion-panel value="0">
             <p-accordion-header class="p-0 justify-content-start gap-2">
diff --git a/src/app/features/preprints/components/stepper/file-step/file-step.component.html b/src/app/features/preprints/components/stepper/file-step/file-step.component.html
index 2b6b6a399..a6fe88c4d 100644
--- a/src/app/features/preprints/components/stepper/file-step/file-step.component.html
+++ b/src/app/features/preprints/components/stepper/file-step/file-step.component.html
@@ -10,40 +10,43 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
   <p class="line-height-3">{{ 'preprints.preprintStepper.file.note' | translate }}</p>
 </section>
 
-<section class="mt-4 w-full flex flex-column gap-2 md:flex-row">
-  <p-button
-    [ngClass]="{
-      active: selectedFileSource() === PreprintFileSource.Computer,
-    }"
-    class="file-source-button w-full"
-    [styleClass]="selectedFileSource() ? 'w-full cursor-not-allowed' : 'w-full'"
-    [label]="'preprints.preprintStepper.file.uploadFromComputer' | translate | titlecase"
-    severity="secondary"
-    [disabled]="isFileSourceSelected()"
-    [pTooltip]="'preprints.preprintStepper.file.tooltips.computerDisabled' | translate"
-    tooltipPosition="top"
-    (onClick)="selectFileSource(PreprintFileSource.Computer)"
-  />
-  <p-button
-    [ngClass]="{
-      active: selectedFileSource() === PreprintFileSource.Project,
-    }"
-    class="file-source-button w-full"
-    [styleClass]="isFileSourceSelected() ? 'w-full cursor-not-allowed' : 'w-full'"
-    [label]="'preprints.preprintStepper.file.selectFromProject' | translate | titlecase"
-    severity="secondary"
-    [disabled]="isFileSourceSelected() || versionFileMode()"
-    [pTooltip]="'preprints.preprintStepper.file.tooltips.projectDisabled' | translate"
-    tooltipPosition="top"
-    (onClick)="selectFileSource(PreprintFileSource.Project)"
-  />
-</section>
+@if (!preprintHasPrimaryFile() || versionFileMode()) {
+  <section class="mt-4 w-full flex flex-column gap-2 md:flex-row">
+    <p-button
+      [ngClass]="{
+        active: selectedFileSource() === PreprintFileSource.Computer,
+      }"
+      class="file-source-button w-full"
+      [styleClass]="selectedFileSource() ? 'w-full cursor-not-allowed' : 'w-full'"
+      [label]="'preprints.preprintStepper.file.uploadFromComputer' | translate | titlecase"
+      severity="secondary"
+      [disabled]="isFileSourceSelected()"
+      [pTooltip]="'preprints.preprintStepper.file.tooltips.computerDisabled' | translate"
+      tooltipPosition="top"
+      (onClick)="selectFileSource(PreprintFileSource.Computer)"
+    />
+    <p-button
+      data-test-select-button
+      [ngClass]="{
+        active: selectedFileSource() === PreprintFileSource.Project,
+      }"
+      class="file-source-button w-full"
+      [styleClass]="isFileSourceSelected() ? 'w-full cursor-not-allowed' : 'w-full'"
+      [label]="'preprints.preprintStepper.file.selectFromProject' | translate"
+      severity="secondary"
+      [disabled]="isFileSourceSelected() || versionFileMode()"
+      [pTooltip]="'preprints.preprintStepper.file.tooltips.projectDisabled' | translate"
+      tooltipPosition="top"
+      (onClick)="selectFileSource(PreprintFileSource.Project)"
+    />
+  </section>
+}
 
 @if (selectedFileSource() === PreprintFileSource.Computer) {
   <section class="mt-6">
     @if (!fileUploadLink()) {
       <p-skeleton width="5rem" height="2rem" />
-    } @else if ((!preprintFiles().length && !arePreprintFilesLoading()) || versionFileMode()) {
+    } @else if ((!preprintFile() && !isPreprintFileLoading()) || versionFileMode()) {
       <p-button
         outlined
         raised
@@ -58,7 +61,7 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
   </section>
 }
 
-@if (selectedFileSource() === PreprintFileSource.Project && !preprintFiles().length && !arePreprintFilesLoading()) {
+@if (selectedFileSource() === PreprintFileSource.Project && !preprintFile() && !isPreprintFileLoading()) {
   <p-card styleClass="mt-6" class="card">
     <div>
       <p class="line-height-3">{{ 'preprints.preprintStepper.file.projectSelection.description' | translate }}</p>
@@ -99,28 +102,39 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
     }
   </section>
 }
+
+@if (cancelSourceOptionButtonVisible()) {
+  <div class="mt-3 flex flex-row justify-content-end">
+    <p-button
+      class="md:w-6rem"
+      styleClass="w-full"
+      [label]="'common.buttons.cancel' | translate"
+      severity="info"
+      (onClick)="cancelButtonClicked()"
+    />
+  </div>
+}
+
 @if (!versionFileMode()) {
   <section class="mt-6">
-    @if (arePreprintFilesLoading()) {
+    @if (isPreprintFileLoading()) {
       <p-skeleton height="2rem" class="w-full" />
-    } @else {
-      @for (file of preprintFiles(); track file.id) {
-        <section class="file-row">
-          <div class="flex flex-row gap-2">
-            <osf-icon [iconClass]="'fas fa-file'" />
-            <p>{{ file.name }}</p>
-          </div>
+    } @else if (preprintFile()) {
+      <section class="file-row">
+        <div class="flex flex-row gap-2">
+          <osf-icon [iconClass]="'fas fa-file'" />
+          <p data-test-file-name>{{ preprintFile()!.name }}</p>
+        </div>
 
-          <p-button
-            class="danger-icon-btn"
-            icon="fas fa-trash"
-            severity="danger"
-            text
-            [ariaLabel]="'common.buttons.delete' | translate"
-            (onClick)="versionFile()"
-          />
-        </section>
-      }
+        <p-button
+          class="danger-icon-btn"
+          icon="fas fa-trash"
+          severity="danger"
+          text
+          [ariaLabel]="'common.buttons.delete' | translate"
+          (onClick)="versionFile()"
+        />
+      </section>
     }
   </section>
 }
@@ -137,9 +151,9 @@ <h2>{{ 'preprints.preprintStepper.file.title' | translate }}</h2>
     class="w-6 md:w-9rem"
     styleClass="w-full"
     [label]="'common.buttons.next' | translate"
-    [disabled]="!preprint()?.primaryFileId || versionFileMode()"
+    [disabled]="!preprintFile() || versionFileMode()"
     [pTooltip]="
-      !preprint()?.primaryFileId || versionFileMode()
+      !preprintFile() || versionFileMode()
         ? ('preprints.preprintStepper.common.validation.fillRequiredFields' | translate)
         : ''
     "
diff --git a/src/app/features/preprints/components/stepper/file-step/file-step.component.ts b/src/app/features/preprints/components/stepper/file-step/file-step.component.ts
index 7717beea2..d3f23ff67 100644
--- a/src/app/features/preprints/components/stepper/file-step/file-step.component.ts
+++ b/src/app/features/preprints/components/stepper/file-step/file-step.component.ts
@@ -32,6 +32,7 @@ import {
   CopyFileFromProject,
   FetchAvailableProjects,
   FetchPreprintFilesLinks,
+  FetchPreprintPrimaryFile,
   FetchProjectFiles,
   FetchProjectFilesByLink,
   PreprintStepperSelectors,
@@ -73,6 +74,7 @@ export class FileStepComponent implements OnInit {
     getPreprintFilesLinks: FetchPreprintFilesLinks,
     uploadFile: UploadFile,
     reuploadFile: ReuploadFile,
+    fetchPreprintFile: FetchPreprintPrimaryFile,
     getAvailableProjects: FetchAvailableProjects,
     getFilesForSelectedProject: FetchProjectFiles,
     getProjectFilesByLink: FetchProjectFilesByLink,
@@ -88,17 +90,31 @@ export class FileStepComponent implements OnInit {
   providerId = select(PreprintStepperSelectors.getSelectedProviderId);
   selectedFileSource = select(PreprintStepperSelectors.getSelectedFileSource);
   fileUploadLink = select(PreprintStepperSelectors.getUploadLink);
-  preprintFiles = select(PreprintStepperSelectors.getPreprintFiles);
-  arePreprintFilesLoading = select(PreprintStepperSelectors.arePreprintFilesLoading);
+
+  preprintFile = select(PreprintStepperSelectors.getPreprintFile);
+  isPreprintFileLoading = select(PreprintStepperSelectors.isPreprintFilesLoading);
+
   availableProjects = select(PreprintStepperSelectors.getAvailableProjects);
   areAvailableProjectsLoading = select(PreprintStepperSelectors.areAvailableProjectsLoading);
+
   projectFiles = select(PreprintStepperSelectors.getProjectFiles);
   areProjectFilesLoading = select(PreprintStepperSelectors.areProjectFilesLoading);
+
   currentFolder = select(PreprintStepperSelectors.getCurrentFolder);
   selectedProjectId = signal<StringOrNull>(null);
 
   versionFileMode = signal<boolean>(false);
 
+  preprintHasPrimaryFile = computed(() => {
+    return !!this.preprint()?.primaryFileId;
+  });
+
+  cancelSourceOptionButtonVisible = computed(() => {
+    return (
+      !this.preprintFile() && this.selectedFileSource() !== PreprintFileSource.None && !this.isPreprintFileLoading()
+    );
+  });
+
   projectNameControl = new FormControl<StringOrNull>(null);
 
   filesTreeActions: FilesTreeActions = {
@@ -119,7 +135,9 @@ export class FileStepComponent implements OnInit {
 
   ngOnInit() {
     this.actions.getPreprintFilesLinks();
-
+    if (this.preprintHasPrimaryFile() && !this.preprintFile()) {
+      this.actions.fetchPreprintFile();
+    }
     this.projectNameControl.valueChanges
       .pipe(debounceTime(500), distinctUntilChanged(), takeUntilDestroyed(this.destroyRef))
       .subscribe((projectNameOrId) => {
@@ -159,9 +177,17 @@ export class FileStepComponent implements OnInit {
 
     if (this.versionFileMode()) {
       this.versionFileMode.set(false);
-      this.actions.reuploadFile(file);
+      this.actions.reuploadFile(file).subscribe({
+        next: () => {
+          this.actions.fetchPreprintFile();
+        },
+      });
     } else {
-      this.actions.uploadFile(file);
+      this.actions.uploadFile(file).subscribe({
+        next: () => {
+          this.actions.fetchPreprintFile();
+        },
+      });
     }
   }
 
@@ -175,7 +201,11 @@ export class FileStepComponent implements OnInit {
   }
 
   selectProjectFile(file: OsfFile) {
-    this.actions.copyFileFromProject(file);
+    this.actions.copyFileFromProject(file).subscribe({
+      next: () => {
+        this.actions.fetchPreprintFile();
+      },
+    });
   }
 
   versionFile() {
@@ -189,4 +219,12 @@ export class FileStepComponent implements OnInit {
       onReject: () => null,
     });
   }
+
+  cancelButtonClicked() {
+    if (this.preprintFile()) {
+      return;
+    }
+
+    this.actions.setSelectedFileSource(PreprintFileSource.None);
+  }
 }
diff --git a/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.html b/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.html
index 7965285d4..5db80a58c 100644
--- a/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.html
+++ b/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.html
@@ -10,6 +10,8 @@ <h2>{{ 'project.overview.metadata.contributors' | translate }}</h2>
   <osf-contributors-list
     class="w-full"
     [contributors]="contributors()"
+    [currentUserId]="currentUser()?.id"
+    [isCurrentUserAdminContributor]="isCurrentUserAdminContributor()"
     [isLoading]="isContributorsLoading()"
     (remove)="removeContributor($event)"
   />
@@ -20,12 +22,14 @@ <h2>{{ 'project.overview.metadata.contributors' | translate }}</h2>
         <p-button (click)="save()" [label]="'common.buttons.save' | translate" />
       </div>
     }
-    <p-button
-      class="w-full md:w-auto"
-      styleClass="w-full"
-      [label]="'preprints.addContributorBySearch' | translate"
-      type="submit"
-      (onClick)="openAddContributorDialog()"
-    ></p-button>
+    @if (isCurrentUserAdminContributor()) {
+      <p-button
+        class="w-full md:w-auto"
+        styleClass="w-full"
+        [label]="'preprints.addContributorBySearch' | translate"
+        type="submit"
+        (onClick)="openAddContributorDialog()"
+      />
+    }
   </div>
 </p-card>
diff --git a/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.ts b/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.ts
index f9b813287..47dc7ee9c 100644
--- a/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.ts
+++ b/src/app/features/preprints/components/stepper/metadata-step/contributors/contributors.component.ts
@@ -10,16 +10,27 @@ import { TableModule } from 'primeng/table';
 
 import { filter, forkJoin } from 'rxjs';
 
-import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, input, OnInit, signal } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  DestroyRef,
+  effect,
+  inject,
+  input,
+  OnInit,
+  signal,
+} from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 
+import { UserSelectors } from '@core/store/user';
 import {
   AddContributorDialogComponent,
   AddUnregisteredContributorDialogComponent,
   ContributorsListComponent,
 } from '@osf/shared/components/contributors';
-import { AddContributorType, ResourceType } from '@osf/shared/enums';
+import { AddContributorType, ContributorPermission, ResourceType } from '@osf/shared/enums';
 import { findChangedItems } from '@osf/shared/helpers';
 import { ContributorDialogAddModel, ContributorModel } from '@osf/shared/models';
 import { CustomConfirmationService, ToastService } from '@osf/shared/services';
@@ -50,8 +61,18 @@ export class ContributorsComponent implements OnInit {
 
   initialContributors = select(ContributorsSelectors.getContributors);
   contributors = signal([]);
+  isContributorsLoading = select(ContributorsSelectors.isContributorsLoading);
+  currentUser = select(UserSelectors.getCurrentUser);
+
+  isCurrentUserAdminContributor = computed(() => {
+    const currentUserId = this.currentUser()?.id;
+    const initialContributors = this.initialContributors();
+    if (!currentUserId) return false;
 
-  readonly isContributorsLoading = select(ContributorsSelectors.isContributorsLoading);
+    return initialContributors.some((contributor: ContributorModel) => {
+      return contributor.userId === currentUserId && contributor.permission === ContributorPermission.Admin;
+    });
+  });
 
   actions = createDispatchMap({
     getContributors: GetAllContributors,
diff --git a/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.html b/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.html
index 1e2736c74..7bbba2f5b 100644
--- a/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.html
+++ b/src/app/features/preprints/components/stepper/metadata-step/metadata-step.component.html
@@ -10,8 +10,9 @@ <h2 class="mb-2">{{ 'shared.license.title' | translate }}</h2>
   <p class="mb-1">{{ 'shared.license.description' | translate }}</p>
   <p>
     {{ 'shared.license.helpText' | translate }}
-    <a href="https://help.osf.io/article/148-licensing" target="_blank">{{ 'common.links.helpGuide' | translate }}</a
-    >.
+    <a class="font-bold" href="https://help.osf.io/article/148-licensing" target="_blank" rel="noopener noreferrer">
+      {{ 'common.links.helpGuide' | translate }}.
+    </a>
   </p>
   <osf-license
     [licenses]="licenses()"
diff --git a/src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.html b/src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.html
index f8d105da8..f8611ac37 100644
--- a/src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.html
+++ b/src/app/features/preprints/components/stepper/metadata-step/preprints-affiliated-institutions/preprints-affiliated-institutions.component.html
@@ -1,12 +1,13 @@
 <p-card>
   <div>
     <h2>{{ 'preprints.preprintStepper.metadata.affiliatedInstitutionsTitle' | translate }}</h2>
-    <p class="mt-3">
-      {{
+    <p
+      class="mt-3"
+      [innerHTML]="
         'preprints.preprintStepper.metadata.affiliatedInstitutionsDescription'
           | translate: { preprintWord: provider()?.preprintWord }
-      }}
-    </p>
+      "
+    ></p>
 
     <div class="mt-4">
       <osf-affiliated-institution-select
diff --git a/src/app/features/preprints/components/stepper/review-step/review-step.component.html b/src/app/features/preprints/components/stepper/review-step/review-step.component.html
index 440e6c676..196c72858 100644
--- a/src/app/features/preprints/components/stepper/review-step/review-step.component.html
+++ b/src/app/features/preprints/components/stepper/review-step/review-step.component.html
@@ -10,9 +10,13 @@ <h2>{{ 'preprints.preprintStepper.review.title' | translate | titlecase }}</h2>
 </p>
 <p>
   {{ 'preprints.preprintStepper.review.learnMore' | translate }}
-  <a href="https://help.osf.io/article/592-preprint-moderation">{{
-    'preprints.preprintStepper.review.moderationPolicies' | translate
-  }}</a>
+  <a
+    class="font-bold"
+    href="https://help.osf.io/article/592-preprint-moderation"
+    target="_blank"
+    rel="noopener noreferrer"
+    >{{ 'preprints.preprintStepper.review.moderationPolicies' | translate }}</a
+  >
   {{ 'preprints.preprintStepper.review.supportCenter' | translate }}
 </p>
 
@@ -61,7 +65,18 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.contributors' | trans
       <div class="flex gap-1 line-height-2">
         @for (contributor of bibliographicContributors(); track contributor.id) {
           <div>
-            <a class="font-bold"> {{ contributor.fullName }}</a>
+            @if (contributor.isUnregisteredContributor) {
+              <span>{{ contributor.fullName }}</span>
+            } @else {
+              <a
+                class="font-bold"
+                [href]="`${environment.webUrl}/${contributor.userId}`"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {{ contributor.fullName }}
+              </a>
+            }
             <span>{{ $last ? '' : ',' }}</span>
           </div>
         }
@@ -69,7 +84,7 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.contributors' | trans
     </section>
 
     @if (affiliatedInstitutions().length) {
-      <osf-affiliated-institutions-view [institutions]="affiliatedInstitutions()" />
+      <osf-affiliated-institutions-view data-test-preprint-institution-list [institutions]="affiliatedInstitutions()" />
     }
 
     <section class="license flex flex-column gap-2">
@@ -91,7 +106,7 @@ <h3>{{ 'preprints.preprintStepper.review.sections.metadata.license' | translate
       <section class="flex flex-column gap-2">
         <h3>{{ 'preprints.preprintStepper.review.sections.metadata.publicationDoi' | translate }}</h3>
 
-        <a [href]="preprint()?.articleDoiLink">
+        <a [href]="preprint()?.articleDoiLink" target="_blank" rel="noopener noreferrer">
           {{ preprint()?.articleDoiLink }}
         </a>
       </section>
@@ -237,6 +252,7 @@ <h2>{{ 'preprints.preprintStepper.review.sections.supplements.title' | translate
     [disabled]="isPreprintSubmitting()"
   />
   <p-button
+    data-test-submit-button
     class="w-6 md:w-9rem"
     styleClass="w-full"
     [label]="'common.buttons.submit' | translate"
diff --git a/src/app/features/preprints/components/stepper/review-step/review-step.component.ts b/src/app/features/preprints/components/stepper/review-step/review-step.component.ts
index bb01c7d70..acfe9feeb 100644
--- a/src/app/features/preprints/components/stepper/review-step/review-step.component.ts
+++ b/src/app/features/preprints/components/stepper/review-step/review-step.component.ts
@@ -26,6 +26,8 @@ import { ToastService } from '@shared/services';
 import { ContributorsSelectors, FetchSelectedSubjects, GetAllContributors, SubjectsSelectors } from '@shared/stores';
 import { FetchResourceInstitutions, InstitutionsSelectors } from '@shared/stores/institutions';
 
+import { environment } from 'src/environments/environment';
+
 @Component({
   selector: 'osf-review-step',
   imports: [
@@ -74,6 +76,7 @@ export class ReviewStepComponent implements OnInit {
     return (this.preprint()?.licenseOptions ?? {}) as Record<string, string>;
   });
 
+  readonly environment = environment;
   readonly ApplicabilityStatus = ApplicabilityStatus;
   readonly PreregLinkInfo = PreregLinkInfo;
 
diff --git a/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.html b/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.html
index 9ec112e1a..01bd85ba5 100644
--- a/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.html
+++ b/src/app/features/preprints/components/stepper/title-and-abstract-step/title-and-abstract-step.component.html
@@ -13,6 +13,7 @@ <h2>{{ 'preprints.preprintStepper.titleAndAbstract.title' | translate }}</h2>
     <div class="flex flex-column">
       <label for="abstract">{{ 'preprints.preprintStepper.titleAndAbstract.abstractLabel' | translate }}</label>
       <textarea
+        data-test-abstract-input
         pTextarea
         id="abstract"
         [rows]="4"
@@ -53,6 +54,7 @@ <h2>{{ 'preprints.preprintStepper.titleAndAbstract.title' | translate }}</h2>
     [routerLink]="['/preprints', providerId(), 'discover']"
   />
   <p-button
+    data-test-next-button
     class="w-6 md:w-9rem"
     styleClass="w-full"
     [label]="'common.buttons.next' | translate"
diff --git a/src/app/features/preprints/constants/form-input-limits.const.ts b/src/app/features/preprints/constants/form-input-limits.const.ts
index 2fb0de2d2..abee2a74d 100644
--- a/src/app/features/preprints/constants/form-input-limits.const.ts
+++ b/src/app/features/preprints/constants/form-input-limits.const.ts
@@ -4,7 +4,7 @@ export const formInputLimits = {
     maxLength: 3000,
   },
   title: {
-    maxLength: 100,
+    maxLength: 512,
   },
   doi: {
     pattern: /^10\.\d{4}\/[\s\S]{2,500}$/,
diff --git a/src/app/features/preprints/constants/index.ts b/src/app/features/preprints/constants/index.ts
index 936d1f7f4..7e11134d5 100644
--- a/src/app/features/preprints/constants/index.ts
+++ b/src/app/features/preprints/constants/index.ts
@@ -5,4 +5,3 @@ export * from './preprints-fields.const';
 export * from './prereg-link-options.const';
 export * from './status-banner.const';
 export * from './submit-preprint-steps.const';
-export * from './update-preprint-steps.const';
diff --git a/src/app/features/preprints/constants/update-preprint-steps.const.ts b/src/app/features/preprints/constants/update-preprint-steps.const.ts
deleted file mode 100644
index f2cc9beb2..000000000
--- a/src/app/features/preprints/constants/update-preprint-steps.const.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { PreprintSteps } from '@osf/features/preprints/enums';
-import { StepOption } from '@shared/models';
-
-export const updatePreprintSteps: StepOption[] = [
-  {
-    index: 0,
-    label: 'preprints.preprintStepper.steps.titleAndAbstract',
-    value: PreprintSteps.TitleAndAbstract,
-  },
-  {
-    index: 1,
-    label: 'preprints.preprintStepper.steps.metadata',
-    value: PreprintSteps.Metadata,
-  },
-  {
-    index: 2,
-    label: 'preprints.preprintStepper.steps.authorAssertions',
-    value: PreprintSteps.AuthorAssertions,
-  },
-  {
-    index: 3,
-    label: 'preprints.preprintStepper.steps.supplements',
-    value: PreprintSteps.Supplements,
-  },
-  {
-    index: 4,
-    label: 'preprints.preprintStepper.steps.review',
-    value: PreprintSteps.Review,
-  },
-];
diff --git a/src/app/features/preprints/models/preprint.models.ts b/src/app/features/preprints/models/preprint.models.ts
index 1892e62b4..d425d17ff 100644
--- a/src/app/features/preprints/models/preprint.models.ts
+++ b/src/app/features/preprints/models/preprint.models.ts
@@ -47,7 +47,6 @@ export interface Preprint {
 }
 
 export interface PreprintFilesLinks {
-  filesLink: string;
   uploadFileLink: string;
 }
 
diff --git a/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.html b/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.html
index a309fe31b..520805773 100644
--- a/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.html
+++ b/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.html
@@ -35,6 +35,13 @@ <h1 class="preprint-provider-name">
     @case (PreprintSteps.TitleAndAbstract) {
       <osf-title-and-abstract-step (nextClicked)="moveToNextStep()" />
     }
+    @case (SubmitStepsEnum.File) {
+      <osf-file-step
+        [provider]="preprintProvider()"
+        (nextClicked)="moveToNextStep()"
+        (backClicked)="moveToPreviousStep()"
+      />
+    }
     @case (PreprintSteps.Metadata) {
       <osf-preprint-metadata
         (nextClicked)="moveToNextStep()"
diff --git a/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts b/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts
index 256f77457..5c4281755 100644
--- a/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts
+++ b/src/app/features/preprints/pages/update-preprint-stepper/update-preprint-stepper.component.ts
@@ -23,13 +23,14 @@ import { ActivatedRoute } from '@angular/router';
 
 import {
   AuthorAssertionsStepComponent,
+  FileStepComponent,
   MetadataStepComponent,
   ReviewStepComponent,
   SupplementsStepComponent,
   TitleAndAbstractStepComponent,
 } from '@osf/features/preprints/components';
-import { updatePreprintSteps } from '@osf/features/preprints/constants';
-import { PreprintSteps } from '@osf/features/preprints/enums';
+import { submitPreprintSteps } from '@osf/features/preprints/constants';
+import { PreprintSteps, ProviderReviewsWorkflow, ReviewsState } from '@osf/features/preprints/enums';
 import { GetPreprintProviderById, PreprintProvidersSelectors } from '@osf/features/preprints/store/preprint-providers';
 import {
   FetchPreprintById,
@@ -39,6 +40,7 @@ import {
 } from '@osf/features/preprints/store/preprint-stepper';
 import { BrowserTabHelper, HeaderStyleHelper, IS_WEB } from '@osf/shared/helpers';
 import { StepperComponent } from '@shared/components';
+import { UserPermissions } from '@shared/enums';
 import { CanDeactivateComponent, StepOption } from '@shared/models';
 import { BrandService } from '@shared/services';
 
@@ -53,6 +55,7 @@ import { BrandService } from '@shared/services';
     SupplementsStepComponent,
     ReviewStepComponent,
     TranslatePipe,
+    FileStepComponent,
   ],
   templateUrl: './update-preprint-stepper.component.html',
   styleUrl: './update-preprint-stepper.component.scss',
@@ -73,16 +76,45 @@ export class UpdatePreprintStepperComponent implements OnInit, OnDestroy, CanDea
     fetchPreprint: FetchPreprintById,
   });
 
+  preprintProvider = select(PreprintProvidersSelectors.getPreprintProviderDetails(this.providerId()));
+  preprint = select(PreprintStepperSelectors.getPreprint);
+  isPreprintProviderLoading = select(PreprintProvidersSelectors.isPreprintProviderDetailsLoading);
+  hasBeenSubmitted = select(PreprintStepperSelectors.hasBeenSubmitted);
+
+  currentUserIsAdmin = computed(() => {
+    return this.preprint()?.currentUserPermissions.includes(UserPermissions.Admin) || false;
+  });
+
+  editAndResubmitMode = computed(() => {
+    const providerIsPremod = this.preprintProvider()?.reviewsWorkflow === ProviderReviewsWorkflow.PreModeration;
+    const preprintIsRejected = this.preprint()?.reviewsState === ReviewsState.Rejected;
+
+    return providerIsPremod && preprintIsRejected;
+  });
+
   readonly updateSteps = computed(() => {
     const provider = this.preprintProvider();
+    const preprint = this.preprint();
 
-    if (!provider) {
+    if (!provider || !preprint) {
       return [];
     }
 
-    return updatePreprintSteps
+    return submitPreprintSteps
+      .map((step) => {
+        if (step.value !== PreprintSteps.File) {
+          return step;
+        }
+
+        return this.editAndResubmitMode() ? step : null;
+      })
+      .filter((step) => step !== null)
       .map((step) => {
-        if (!provider.assertionsEnabled && step.value === PreprintSteps.AuthorAssertions) {
+        if (step.value !== PreprintSteps.AuthorAssertions) {
+          return step;
+        }
+
+        if (!provider.assertionsEnabled || !this.currentUserIsAdmin()) {
           return null;
         }
 
@@ -95,10 +127,7 @@ export class UpdatePreprintStepperComponent implements OnInit, OnDestroy, CanDea
       }));
   });
 
-  preprintProvider = select(PreprintProvidersSelectors.getPreprintProviderDetails(this.providerId()));
-  isPreprintProviderLoading = select(PreprintProvidersSelectors.isPreprintProviderDetailsLoading);
-  hasBeenSubmitted = select(PreprintStepperSelectors.hasBeenSubmitted);
-  currentStep = signal<StepOption>(updatePreprintSteps[0]);
+  currentStep = signal<StepOption>(submitPreprintSteps[0]);
   isWeb = toSignal(inject(IS_WEB));
 
   readonly PreprintSteps = PreprintSteps;
@@ -158,4 +187,6 @@ export class UpdatePreprintStepperComponent implements OnInit, OnDestroy, CanDea
     $event.preventDefault();
     return false;
   }
+
+  protected readonly SubmitStepsEnum = PreprintSteps;
 }
diff --git a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.actions.ts b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.actions.ts
index 61fe26df9..525bd15ed 100644
--- a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.actions.ts
+++ b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.actions.ts
@@ -62,8 +62,8 @@ export class CopyFileFromProject {
   constructor(public file: OsfFile) {}
 }
 
-export class FetchPreprintFiles {
-  static readonly type = '[Preprint Stepper] Get Preprint Files';
+export class FetchPreprintPrimaryFile {
+  static readonly type = '[Preprint Stepper] Fetch Preprint Primary File';
 }
 
 export class FetchAvailableProjects {
diff --git a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.model.ts b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.model.ts
index 5e3a6b628..f760130c0 100644
--- a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.model.ts
+++ b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.model.ts
@@ -9,7 +9,7 @@ export interface PreprintStepperStateModel {
   preprint: AsyncStateModel<Preprint | null>;
   fileSource: PreprintFileSource;
   preprintFilesLinks: AsyncStateModel<PreprintFilesLinks | null>;
-  preprintFiles: AsyncStateModel<OsfFile[]>;
+  preprintFile: AsyncStateModel<OsfFile | null>;
   availableProjects: AsyncStateModel<IdName[]>;
   projectFiles: AsyncStateModel<OsfFile[]>;
   licenses: AsyncStateModel<LicenseModel[]>;
diff --git a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.selectors.ts b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.selectors.ts
index 2f8091f9b..b2c8852dc 100644
--- a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.selectors.ts
+++ b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.selectors.ts
@@ -29,13 +29,13 @@ export class PreprintStepperSelectors {
   }
 
   @Selector([PreprintStepperState])
-  static getPreprintFiles(state: PreprintStepperStateModel) {
-    return state.preprintFiles.data;
+  static getPreprintFile(state: PreprintStepperStateModel) {
+    return state.preprintFile.data;
   }
 
   @Selector([PreprintStepperState])
-  static arePreprintFilesLoading(state: PreprintStepperStateModel) {
-    return state.preprintFiles.isLoading;
+  static isPreprintFilesLoading(state: PreprintStepperStateModel) {
+    return state.preprintFile.isLoading;
   }
 
   @Selector([PreprintStepperState])
diff --git a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts
index 8a023d275..7dce2d276 100644
--- a/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts
+++ b/src/app/features/preprints/store/preprint-stepper/preprint-stepper.state.ts
@@ -30,8 +30,8 @@ import {
   FetchAvailableProjects,
   FetchLicenses,
   FetchPreprintById,
-  FetchPreprintFiles,
   FetchPreprintFilesLinks,
+  FetchPreprintPrimaryFile,
   FetchPreprintProject,
   FetchProjectFiles,
   FetchProjectFilesByLink,
@@ -61,8 +61,8 @@ const DefaultState: PreprintStepperStateModel = {
     isLoading: false,
     error: null,
   },
-  preprintFiles: {
-    data: [],
+  preprintFile: {
+    data: null,
     isLoading: false,
     error: null,
   },
@@ -167,14 +167,13 @@ export class PreprintStepperState {
       return EMPTY;
     }
 
-    ctx.setState(patch({ preprintFiles: patch({ isLoading: true }) }));
+    ctx.setState(patch({ preprintFile: patch({ isLoading: true }) }));
 
     return this.fileService.uploadFile(action.file, state.preprintFilesLinks.data.uploadFileLink).pipe(
       filter((event) => event.type === HttpEventType.Response),
       switchMap((event) => {
         const file = event.body!.data;
         const createdFileId = file.id.split('/')[1];
-        ctx.dispatch(new FetchPreprintFiles());
 
         return this.preprintFilesService.updateFileRelationship(state.preprint.data!.id, createdFileId).pipe(
           tap((preprint: Preprint) => {
@@ -197,39 +196,36 @@ export class PreprintStepperState {
   @Action(ReuploadFile)
   reuploadFile(ctx: StateContext<PreprintStepperStateModel>, action: ReuploadFile) {
     const state = ctx.getState();
-    const uploadedFile = state.preprintFiles.data[0];
+    const uploadedFile = state.preprintFile.data;
     if (!uploadedFile) return EMPTY;
 
-    ctx.setState(patch({ preprintFiles: patch({ isLoading: true }) }));
+    ctx.setState(patch({ preprintFile: patch({ isLoading: true }) }));
 
-    return this.fileService.updateFileContent(action.file, uploadedFile.links.upload).pipe(
-      switchMap(() => this.fileService.renameEntry(uploadedFile.links.upload, action.file.name, 'replace')),
-      tap(() => {
-        ctx.dispatch(FetchPreprintFiles);
-      })
-    );
+    return this.fileService
+      .updateFileContent(action.file, uploadedFile.links.upload)
+      .pipe(switchMap(() => this.fileService.renameEntry(uploadedFile.links.upload, action.file.name, 'replace')));
   }
 
-  @Action(FetchPreprintFiles)
-  getPreprintFiles(ctx: StateContext<PreprintStepperStateModel>) {
+  @Action(FetchPreprintPrimaryFile)
+  fetchPreprintPrimaryFile(ctx: StateContext<PreprintStepperStateModel>) {
     const state = ctx.getState();
-    if (!state.preprintFilesLinks.data?.filesLink) {
-      return EMPTY;
-    }
-    ctx.setState(patch({ preprintFiles: patch({ isLoading: true }) }));
+    const primaryFileId = state.preprint.data?.primaryFileId;
+    if (!primaryFileId) return EMPTY;
 
-    return this.fileService.getFilesWithoutFiltering(state.preprintFilesLinks.data.filesLink).pipe(
-      tap((files: OsfFile[]) => {
+    ctx.setState(patch({ preprintFile: patch({ isLoading: true }) }));
+
+    return this.fileService.getFileById(primaryFileId).pipe(
+      tap((file: OsfFile) => {
         ctx.setState(
           patch({
-            preprintFiles: patch({
-              data: files,
+            preprintFile: patch({
+              data: file,
               isLoading: false,
             }),
           })
         );
       }),
-      catchError((error) => handleSectionError(ctx, 'preprintFiles', error))
+      catchError((error) => handleSectionError(ctx, 'preprintFile', error))
     );
   }
 
@@ -270,7 +266,7 @@ export class PreprintStepperState {
       catchError((error) => {
         ctx.setState(
           patch({
-            preprintFiles: patch({
+            projectFiles: patch({
               data: [],
             }),
           })
@@ -313,13 +309,11 @@ export class PreprintStepperState {
       return;
     }
 
-    ctx.setState(patch({ preprintFiles: patch({ isLoading: true }) }));
+    ctx.setState(patch({ preprintFile: patch({ isLoading: true }) }));
     return this.fileService
       .copyFileToAnotherLocation(action.file.links.move, action.file.provider, createdPreprintId)
       .pipe(
         switchMap((file: OsfFile) => {
-          ctx.dispatch(new FetchPreprintFiles());
-
           const fileIdAfterCopy = file.id.split('/')[1];
 
           return this.preprintFilesService.updateFileRelationship(createdPreprintId, fileIdAfterCopy).pipe(
@@ -337,7 +331,7 @@ export class PreprintStepperState {
             catchError((error) => handleSectionError(ctx, 'preprint', error))
           );
         }),
-        catchError((error) => handleSectionError(ctx, 'preprintFiles', error))
+        catchError((error) => handleSectionError(ctx, 'preprintFile', error))
       );
   }
 
diff --git a/src/app/features/registries/components/metadata/contributors/contributors.component.html b/src/app/features/registries/components/metadata/contributors/contributors.component.html
index ddd24e9f4..0e1864b7c 100644
--- a/src/app/features/registries/components/metadata/contributors/contributors.component.html
+++ b/src/app/features/registries/components/metadata/contributors/contributors.component.html
@@ -5,6 +5,8 @@ <h2 class="mb-2">{{ 'project.overview.metadata.contributors' | translate }}</h2>
     class="w-full"
     [contributors]="contributors()"
     [isLoading]="isContributorsLoading()"
+    [currentUserId]="currentUser()?.id"
+    [isCurrentUserAdminContributor]="isCurrentUserAdminContributor()"
     (remove)="removeContributor($event)"
   />
 
diff --git a/src/app/features/registries/components/metadata/contributors/contributors.component.ts b/src/app/features/registries/components/metadata/contributors/contributors.component.ts
index cb27d6bd3..f985e3c61 100644
--- a/src/app/features/registries/components/metadata/contributors/contributors.component.ts
+++ b/src/app/features/registries/components/metadata/contributors/contributors.component.ts
@@ -9,20 +9,30 @@ import { TableModule } from 'primeng/table';
 
 import { filter, forkJoin, map, of } from 'rxjs';
 
-import { ChangeDetectionStrategy, Component, DestroyRef, effect, inject, input, OnInit, signal } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  DestroyRef,
+  effect,
+  inject,
+  input,
+  OnInit,
+  signal,
+} from '@angular/core';
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { FormControl, FormsModule } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
 
+import { UserSelectors } from '@core/store/user';
 import {
   AddContributorDialogComponent,
   AddUnregisteredContributorDialogComponent,
   ContributorsListComponent,
 } from '@osf/shared/components/contributors';
-import { BIBLIOGRAPHY_OPTIONS, PERMISSION_OPTIONS } from '@osf/shared/constants';
 import { AddContributorType, ContributorPermission, ResourceType } from '@osf/shared/enums';
 import { findChangedItems } from '@osf/shared/helpers';
-import { ContributorDialogAddModel, ContributorModel, SelectOption } from '@osf/shared/models';
+import { ContributorDialogAddModel, ContributorModel } from '@osf/shared/models';
 import { CustomConfirmationService, ToastService } from '@osf/shared/services';
 import {
   AddContributor,
@@ -52,10 +62,17 @@ export class ContributorsComponent implements OnInit {
   private readonly route = inject(ActivatedRoute);
   private readonly draftId = toSignal(this.route.params.pipe(map((params) => params['id'])) ?? of(undefined));
 
-  readonly selectedPermission = signal<ContributorPermission | null>(null);
-  readonly selectedBibliography = signal<boolean | null>(null);
-  readonly permissionsOptions: SelectOption[] = PERMISSION_OPTIONS;
-  readonly bibliographyOptions: SelectOption[] = BIBLIOGRAPHY_OPTIONS;
+  currentUser = select(UserSelectors.getCurrentUser);
+
+  isCurrentUserAdminContributor = computed(() => {
+    const currentUserId = this.currentUser()?.id;
+    const initialContributors = this.initialContributors();
+    if (!currentUserId) return false;
+
+    return initialContributors.some((contributor: ContributorModel) => {
+      return contributor.userId === currentUserId && contributor.permission === ContributorPermission.Admin;
+    });
+  });
 
   initialContributors = select(ContributorsSelectors.getContributors);
   contributors = signal([]);
diff --git a/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts b/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts
index 9825b30ec..5b2f40d02 100644
--- a/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts
+++ b/src/app/shared/components/addons/storage-item-selector/google-file-picker/google-file-picker.component.ts
@@ -83,7 +83,7 @@ export class GoogleFilePickerComponent implements OnInit {
 
   public createPicker(): void {
     if (!this.isPickerConfigured) return;
-    const google = (window as any).google;
+    const google = window.google;
 
     const googlePickerView = new google.picker.DocsView(google.picker.ViewId.DOCS);
     googlePickerView.setSelectFolderEnabled(true);
@@ -132,7 +132,7 @@ export class GoogleFilePickerComponent implements OnInit {
   }
 
   pickerCallback(data: GoogleFilePickerModel) {
-    if (data.action === (window as any).google.picker.Action.PICKED) {
+    if (data.action === window.google.picker.Action.PICKED) {
       this.#filePickerCallback(data.docs[0]);
     }
   }
diff --git a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.html b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.html
index 092e0ed16..17e3d9e01 100644
--- a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.html
+++ b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.html
@@ -6,7 +6,13 @@ <h3>{{ 'project.overview.metadata.affiliatedInstitutions' | translate }}</h3>
   <div class="flex gap-2">
     @if (institutions().length) {
       @for (institution of institutions(); track institution.id) {
-        <a [routerLink]="`/institutions/${ institution.id}`">
+        <a
+          [routerLink]="`/institutions/${ institution.id}`"
+          target="_blank"
+          rel="noopener noreferrer"
+          [pTooltip]="institution.name"
+          tooltipPosition="top"
+        >
           <img alt="institution logo" [src]="institution.assets.logo" height="45" />
         </a>
       }
diff --git a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts
index d8aaead15..3c60e7802 100644
--- a/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts
+++ b/src/app/shared/components/affiliated-institutions-view/affiliated-institutions-view.component.ts
@@ -1,5 +1,7 @@
 import { TranslatePipe } from '@ngx-translate/core';
 
+import { Tooltip } from 'primeng/tooltip';
+
 import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -7,7 +9,7 @@ import { Institution } from '@shared/models';
 
 @Component({
   selector: 'osf-affiliated-institutions-view',
-  imports: [TranslatePipe, RouterLink],
+  imports: [TranslatePipe, RouterLink, Tooltip],
   templateUrl: './affiliated-institutions-view.component.html',
   styleUrl: './affiliated-institutions-view.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
diff --git a/src/app/shared/components/contributors/contributors-list/contributors-list.component.html b/src/app/shared/components/contributors/contributors-list/contributors-list.component.html
index 62e4ea59f..a4464c84b 100644
--- a/src/app/shared/components/contributors/contributors-list/contributors-list.component.html
+++ b/src/app/shared/components/contributors/contributors-list/contributors-list.component.html
@@ -104,15 +104,29 @@ <h2>{{ 'project.contributors.curatorInfo.heading' | translate }}</h2>
           </p>
         </td>
         <td>
-          <div>
-            <osf-select
-              [options]="permissionsOptions"
-              [placeholder]="'project.contributors.permissionFilter'"
-              [appendTo]="'body'"
-              [noBorder]="true"
-              [(selectedValue)]="contributor.permission"
-            ></osf-select>
-          </div>
+          @if (isCurrentUserAdminContributor()) {
+            <div>
+              <osf-select
+                [options]="permissionsOptions"
+                [placeholder]="'project.contributors.permissionFilter'"
+                [appendTo]="'body'"
+                [noBorder]="true"
+                [(selectedValue)]="contributor.permission"
+              />
+            </div>
+          } @else {
+            @switch (contributor.permission) {
+              @case (ContributorPermission.Admin) {
+                <span>{{ 'project.contributors.permissions.administrator' | translate }}</span>
+              }
+              @case (ContributorPermission.Write) {
+                <span>{{ 'project.contributors.permissions.readAndWrite' | translate }}</span>
+              }
+              @case (ContributorPermission.Read) {
+                <span>{{ 'project.contributors.permissions.read' | translate }}</span>
+              }
+            }
+          }
         </td>
         <td>
           <div class="flex align-items-center justify-content-center">
@@ -121,6 +135,7 @@ <h2>{{ 'project.contributors.curatorInfo.heading' | translate }}</h2>
               binary="true"
               [(ngModel)]="contributor.isBibliographic"
               [ariaLabel]="'project.contributors.table.headers.contributor' | translate"
+              [readonly]="!isCurrentUserAdminContributor()"
             ></p-checkbox>
           </div>
         </td>
@@ -172,15 +187,17 @@ <h2>{{ 'project.contributors.curatorInfo.heading' | translate }}</h2>
           </td>
         }
         <td>
-          <p-button
-            class="danger-icon-btn"
-            icon="fas fa-trash"
-            severity="danger"
-            text
-            [ariaLabel]="'common.buttons.delete' | translate"
-            (onClick)="removeContributor(contributor)"
-            data-test-remove-contributor-button
-          />
+          @if (isCurrentUserAdminContributor() || currentUserId() === contributor.userId) {
+            <p-button
+              class="danger-icon-btn"
+              icon="fas fa-trash"
+              severity="danger"
+              text
+              [ariaLabel]="'common.buttons.delete' | translate"
+              (onClick)="removeContributor(contributor)"
+              data-test-remove-contributor-button
+            />
+          }
         </td>
       </tr>
     } @else {
diff --git a/src/app/shared/components/contributors/contributors-list/contributors-list.component.spec.ts b/src/app/shared/components/contributors/contributors-list/contributors-list.component.spec.ts
index 2fc1eef8b..9c0705668 100644
--- a/src/app/shared/components/contributors/contributors-list/contributors-list.component.spec.ts
+++ b/src/app/shared/components/contributors/contributors-list/contributors-list.component.spec.ts
@@ -4,6 +4,7 @@ import { DialogService } from 'primeng/dynamicdialog';
 
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { ContributorPermission } from '@shared/enums';
 import { MOCK_CONTRIBUTOR, MOCK_CONTRIBUTOR_WITHOUT_HISTORY, TranslateServiceMock } from '@shared/mocks';
 import { ContributorModel } from '@shared/models';
 
@@ -127,10 +128,11 @@ describe('ContributorsListComponent', () => {
       type: 'user',
       isBibliographic: true,
       isCurator: true,
+      isUnregisteredContributor: false,
       fullName: 'Minimal User',
       givenName: 'Minimal User',
       familyName: 'Minimal User',
-      permission: 'read',
+      permission: ContributorPermission.Read,
       education: [],
       employment: [],
     };
diff --git a/src/app/shared/components/contributors/contributors-list/contributors-list.component.ts b/src/app/shared/components/contributors/contributors-list/contributors-list.component.ts
index 5202d25e1..914d5895e 100644
--- a/src/app/shared/components/contributors/contributors-list/contributors-list.component.ts
+++ b/src/app/shared/components/contributors/contributors-list/contributors-list.component.ts
@@ -10,8 +10,10 @@ import { Tooltip } from 'primeng/tooltip';
 import { ChangeDetectionStrategy, Component, inject, input, output, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 
+import { ModeratorPermission } from '@osf/features/moderation/enums';
 import { DEFAULT_TABLE_PARAMS, PERMISSION_OPTIONS } from '@osf/shared/constants';
 import { ContributorModel, SelectOption, TableParameters } from '@osf/shared/models';
+import { ContributorPermission } from '@shared/enums';
 
 import { EducationHistoryDialogComponent } from '../../education-history-dialog/education-history-dialog.component';
 import { EmploymentHistoryDialogComponent } from '../../employment-history-dialog/employment-history-dialog.component';
@@ -32,13 +34,17 @@ export class ContributorsListComponent {
   showEducation = input(true);
   showEmployment = input(true);
 
-  remove = output<ContributorModel>();
+  currentUserId = input<string | undefined>(undefined);
+  isCurrentUserAdminContributor = input<boolean>(true);
 
+  remove = output<ContributorModel>();
   dialogService = inject(DialogService);
   translateService = inject(TranslateService);
 
   readonly tableParams = signal<TableParameters>({ ...DEFAULT_TABLE_PARAMS });
   readonly permissionsOptions: SelectOption[] = PERMISSION_OPTIONS;
+  readonly ModeratorPermission = ModeratorPermission;
+  readonly ContributorPermission = ContributorPermission;
 
   skeletonData: ContributorModel[] = Array.from({ length: 3 }, () => ({}) as ContributorModel);
 
diff --git a/src/app/shared/components/filter-chips/filter-chips.component.ts b/src/app/shared/components/filter-chips/filter-chips.component.ts
index 5d356efb4..87f06aa1c 100644
--- a/src/app/shared/components/filter-chips/filter-chips.component.ts
+++ b/src/app/shared/components/filter-chips/filter-chips.component.ts
@@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, computed, input, output } from '@angular/core';
 
 import { StringOrNull } from '@shared/helpers';
-import { DiscoverableFilter, SelectOption } from '@shared/models';
+import { DiscoverableFilter } from '@shared/models';
 
 @Component({
   selector: 'osf-filter-chips',
@@ -14,7 +14,6 @@ import { DiscoverableFilter, SelectOption } from '@shared/models';
 })
 export class FilterChipsComponent {
   filterValues = input<Record<string, StringOrNull>>({});
-  filterOptionsCache = input<Record<string, SelectOption[]>>({});
   filters = input.required<DiscoverableFilter[]>();
 
   filterRemoved = output<string>();
diff --git a/src/app/shared/components/generic-filter/generic-filter.component.html b/src/app/shared/components/generic-filter/generic-filter.component.html
index 28d77b529..d72d96f17 100644
--- a/src/app/shared/components/generic-filter/generic-filter.component.html
+++ b/src/app/shared/components/generic-filter/generic-filter.component.html
@@ -9,6 +9,7 @@
         [id]="filterType()"
         [options]="filterOptions()"
         optionLabel="label"
+        optionValue="value"
         [ngModel]="selectedValue()"
         [placeholder]="currentSelectedOption() ? currentSelectedOption()?.label : placeholder()"
         styleClass="w-full"
diff --git a/src/app/shared/components/global-search/global-search.component.html b/src/app/shared/components/global-search/global-search.component.html
index 657133649..9e7d6a022 100644
--- a/src/app/shared/components/global-search/global-search.component.html
+++ b/src/app/shared/components/global-search/global-search.component.html
@@ -30,7 +30,6 @@
     <osf-filter-chips
       [filterValues]="filterValues()"
       [filters]="filters()"
-      [filterOptionsCache]="filterOptionsCache()"
       (filterRemoved)="onFilterChipRemoved($event)"
     />
   </div>
diff --git a/src/app/shared/components/reusable-filter/reusable-filter.component.ts b/src/app/shared/components/reusable-filter/reusable-filter.component.ts
index b87f4c87c..1031b44b3 100644
--- a/src/app/shared/components/reusable-filter/reusable-filter.component.ts
+++ b/src/app/shared/components/reusable-filter/reusable-filter.component.ts
@@ -74,7 +74,7 @@ export class ReusableFilterComponent {
     filters.forEach((filter) => {
       if (filter.operator === 'is-present') {
         isPresentFilters.push(filter);
-      } else if (filter.operator === 'any-of' || filter.operator === 'at-date') {
+      } else if (filter.operator.includes('any-of') || filter.operator.includes('at-date')) {
         individualFilters.push(filter);
       }
     });
@@ -168,14 +168,6 @@ export class ReusableFilterComponent {
     return filter.isLoading || false;
   }
 
-  isFilterPaginationLoading(filter: DiscoverableFilter): boolean {
-    return filter.isPaginationLoading || false;
-  }
-
-  isFilterSearchLoading(filter: DiscoverableFilter): boolean {
-    return filter.isSearchLoading || false;
-  }
-
   getSelectedValue(filterKey: string): string | null {
     return this.selectedValues()[filterKey] || null;
   }
diff --git a/src/app/shared/mappers/contributors/contributors.mapper.ts b/src/app/shared/mappers/contributors/contributors.mapper.ts
index 6fceb191d..7a95fc4b7 100644
--- a/src/app/shared/mappers/contributors/contributors.mapper.ts
+++ b/src/app/shared/mappers/contributors/contributors.mapper.ts
@@ -16,6 +16,7 @@ export class ContributorsMapper {
       userId: contributor.embeds.users.data.id,
       type: contributor.type,
       isBibliographic: contributor.attributes.bibliographic,
+      isUnregisteredContributor: !!contributor.attributes.unregistered_contributor,
       isCurator: contributor.attributes.is_curator,
       permission: contributor.attributes.permission,
       fullName: contributor.embeds.users.data.attributes.full_name,
@@ -50,6 +51,7 @@ export class ContributorsMapper {
       type: response.type,
       isBibliographic: response.attributes.bibliographic,
       isCurator: response.attributes.is_curator,
+      isUnregisteredContributor: !!response.attributes.unregistered_contributor,
       permission: response.attributes.permission,
       fullName: response.embeds.users.data.attributes.full_name,
       givenName: response.embeds.users.data.attributes.given_name,
diff --git a/src/app/shared/mocks/contributors.mock.ts b/src/app/shared/mocks/contributors.mock.ts
index 9b9e35744..cd641989c 100644
--- a/src/app/shared/mocks/contributors.mock.ts
+++ b/src/app/shared/mocks/contributors.mock.ts
@@ -1,3 +1,5 @@
+import { ContributorPermission } from '@shared/enums';
+
 import { ContributorModel } from '../models';
 
 export const MOCK_CONTRIBUTOR: ContributorModel = {
@@ -7,7 +9,8 @@ export const MOCK_CONTRIBUTOR: ContributorModel = {
   fullName: 'John Doe',
   givenName: 'John Doe',
   familyName: 'John Doe',
-  permission: 'read',
+  isUnregisteredContributor: false,
+  permission: ContributorPermission.Read,
   isBibliographic: true,
   isCurator: false,
   education: [],
@@ -21,7 +24,8 @@ export const MOCK_CONTRIBUTOR_WITHOUT_HISTORY: ContributorModel = {
   fullName: 'Jane Smith',
   givenName: 'Jane Smith',
   familyName: 'Jane Smith',
-  permission: 'write',
+  isUnregisteredContributor: false,
+  permission: ContributorPermission.Write,
   isBibliographic: false,
   isCurator: true,
   education: [],
diff --git a/src/app/shared/models/contributors/contributor-response.model.ts b/src/app/shared/models/contributors/contributor-response.model.ts
index ae471ae1a..1c77d8d86 100644
--- a/src/app/shared/models/contributors/contributor-response.model.ts
+++ b/src/app/shared/models/contributors/contributor-response.model.ts
@@ -1,11 +1,12 @@
 import { ApiData, Education, Employment } from '@osf/shared/models';
+import { ContributorPermission } from '@shared/enums';
 
 export type ContributorResponse = ApiData<ContributorAttributes, ContributorEmbeds, ContributorRelationships, null>;
 
 export interface ContributorAttributes {
   index: number;
   bibliographic: boolean;
-  permission: string;
+  permission: ContributorPermission;
   unregistered_contributor: string | null;
   is_curator: boolean;
 }
diff --git a/src/app/shared/models/contributors/contributor.model.ts b/src/app/shared/models/contributors/contributor.model.ts
index 46b6cbcc2..13357be30 100644
--- a/src/app/shared/models/contributors/contributor.model.ts
+++ b/src/app/shared/models/contributors/contributor.model.ts
@@ -1,12 +1,14 @@
 import { Education, Employment } from '@osf/shared/models';
+import { ContributorPermission } from '@shared/enums';
 
 export interface ContributorModel {
   id: string;
   userId: string;
   type: string;
   isBibliographic: boolean;
+  isUnregisteredContributor: boolean;
   isCurator: boolean;
-  permission: string;
+  permission: ContributorPermission;
   fullName: string;
   givenName: string;
   familyName: string;
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 3cd7ddd87..f372b1483 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -1996,7 +1996,7 @@
         "uploadDescription": "Please Upload your {{preprintWord}}",
         "note": "Note: You cannot switch options once a file is attached.",
         "uploadFromComputer": "Upload From Your Computer",
-        "selectFromProject": "Select From existing OSF project",
+        "selectFromProject": "Select From Existing OSF Project",
         "uploadFileButton": "Upload file",
         "projectSelection": {
           "title": "Project Title",
@@ -2022,7 +2022,7 @@
         "publicationDateTitle": "Publication Date (optional)",
         "publicationCitationTitle": "Publication Citation (optional)",
         "affiliatedInstitutionsTitle": "Affiliated Institutions",
-        "affiliatedInstitutionsDescription": "You can affiliate your {{preprintWord}} with your institution if it is an OSF institutional member and has worked with the Center for Open Science to create a dedicated institutional OSF landing page."
+        "affiliatedInstitutionsDescription": "You can affiliate your {{preprintWord}} with your institution if it is an OSF institutional member and has worked with the <a class='font-bold' href='https://www.cos.io/products/osf-institutions' target='_blank'>Center for Open Science</a> to create a dedicated <a class='font-bold' href='https://help.osf.io/article/191-view-institutional-landing-pages' target='_blank'>institutional OSF landing page</a>."
       },
       "authorAssertions": {
         "title": "Author Assertions",