diff --git a/dbscripts/xml/install.xml b/dbscripts/xml/install.xml
index ef296cee6dc..96418242e60 100644
--- a/dbscripts/xml/install.xml
+++ b/dbscripts/xml/install.xml
@@ -47,6 +47,7 @@
 	<migration class="PKP\migration\install\CategoriesMigration" />
 	<migration class="PKP\migration\install\HighlightsMigration" />
 	<migration class="APP\migration\install\MetricsMigration" />
+	<migration class="PKP\migration\install\ReviewAssignmentSettings" />
 
 	<!-- Other install tasks -->
 	<code function="createData"/>
diff --git a/dbscripts/xml/upgrade.xml b/dbscripts/xml/upgrade.xml
index 25b9f06ad68..38a618c2001 100644
--- a/dbscripts/xml/upgrade.xml
+++ b/dbscripts/xml/upgrade.xml
@@ -157,6 +157,7 @@
 		<migration class="PKP\migration\upgrade\v3_5_0\I10292_RemoveControlledVocabEntrySettingType"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10292_UpdateControlledVocabAssocId"/>
 		<migration class="PKP\migration\upgrade\v3_5_0\I10292_UpdateControlledVocabEntrySettingName"/>
+		<migration class="PKP\migration\upgrade\v3_5_0\I10759_AddReviewAssignmentSettings"/>
 	</upgrade>
 
 	<!-- update plugin configuration - should be done as the final upgrade task -->
diff --git a/jobs/orcid/DepositOrcidReview.php b/jobs/orcid/DepositOrcidReview.php
index b45d2fed06f..3705233084f 100644
--- a/jobs/orcid/DepositOrcidReview.php
+++ b/jobs/orcid/DepositOrcidReview.php
@@ -71,7 +71,7 @@ public function handle(): void
 
                 $uri = OrcidManager::getApiPath($context) . OrcidManager::ORCID_API_VERSION_URL . $orcid . '/' . OrcidManager::ORCID_REVIEW_URL;
                 $method = 'POST';
-                if ($putCode = $reviewer->getData('orcidReviewPutCode')) {
+                if ($putCode = $reviewAssignment->getData('orcidReviewPutCode')) {
                     $uri .= '/' . $putCode;
                     $method = 'PUT';
                     $orcidReview['put-code'] = $putCode;
@@ -101,11 +101,11 @@ public function handle(): void
                             OrcidManager::logInfo("Review updated in profile, putCode: {$putCode}");
                             break;
                         case 201:
-                            $location = $responseHeaders['Location'][0];
+                            $location = $responseHeaders['location'][0];
                             // Extract the ORCID work put code for updates/deletion.
                             $putCode = basename(parse_url($location, PHP_URL_PATH));
-                            $reviewer->setData('orcidReviewPutCode', $putCode);
-                            Repo::user()->edit($reviewer, ['orcidReviewPutCode']);
+                            $reviewAssignment->setData('orcidReviewPutCode', $putCode);
+                            Repo::reviewAssignment()->edit($reviewAssignment, ['orcidReviewPutCode']);
                             OrcidManager::logInfo("Review added to profile, putCode: {$putCode}");
                             break;
                         default:
diff --git a/lib/pkp b/lib/pkp
index e4585829f6f..25381492486 160000
--- a/lib/pkp
+++ b/lib/pkp
@@ -1 +1 @@
-Subproject commit e4585829f6f1574de2015282f7dba1a2dcfa1b0d
+Subproject commit 25381492486924e96ad143a7e82c5d8f3c4c4226