diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfa8c2b..0162e07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+* [PR-22](https://github.com/OS2web/os2web_datalookup/pull/22)
+  Set actual identifier from lookup on lookup result
+
 ## [3.0.0] - 2025-06-18
 
 * [PR-13](https://github.com/OS2web/os2web_datalookup/pull/13)
diff --git a/src/Plugin/os2web/DataLookup/DatafordelerCVR.php b/src/Plugin/os2web/DataLookup/DatafordelerCVR.php
index 3477e16..43d5ea9 100644
--- a/src/Plugin/os2web/DataLookup/DatafordelerCVR.php
+++ b/src/Plugin/os2web/DataLookup/DatafordelerCVR.php
@@ -78,7 +78,7 @@ public function lookup(string $param): CompanyLookupResult {
     $cvrResult = new CompanyLookupResult();
     if ($result && isset($result->virksomhed) && !empty((array) $result->virksomhed)) {
       $cvrResult->setSuccessful();
-      $cvrResult->setCvr($param);
+      $cvrResult->setCvr($result->virksomhed->CVRNummer);
 
       if ($result->virksomhedsnavn) {
         $cvrResult->setName($result->virksomhedsnavn->vaerdi);
diff --git a/src/Plugin/os2web/DataLookup/ServiceplatformenCPR.php b/src/Plugin/os2web/DataLookup/ServiceplatformenCPR.php
index d71d94f..3696b0e 100644
--- a/src/Plugin/os2web/DataLookup/ServiceplatformenCPR.php
+++ b/src/Plugin/os2web/DataLookup/ServiceplatformenCPR.php
@@ -164,6 +164,7 @@ public function lookup(string $cpr): CprLookupResult {
     // If all goes well, we return an address array.
     if ($result['status']) {
       $cprResult->setSuccessful();
+      // @todo Use a value from from $result to set CPR. But which key?
       $cprResult->setCpr($cpr);
       $cprResult->setName($result['adresseringsnavn'] ?? '');
       $cprResult->setStreet($result['vejadresseringsnavn'] ?? '');
diff --git a/src/Plugin/os2web/DataLookup/ServiceplatformenCPRExtended.php b/src/Plugin/os2web/DataLookup/ServiceplatformenCPRExtended.php
index 4550140..c5266d1 100644
--- a/src/Plugin/os2web/DataLookup/ServiceplatformenCPRExtended.php
+++ b/src/Plugin/os2web/DataLookup/ServiceplatformenCPRExtended.php
@@ -125,9 +125,9 @@ public function lookup(string $cpr, $fetchChildren = TRUE, $allowCprTestModeRepl
     // If all goes well, we return an address array.
     if ($result['status']) {
       $cprResult->setSuccessful();
-      $cprResult->setCpr($cpr);
 
       $persondata = $result['persondata'];
+      $cprResult->setCpr($persondata->personnummer);
 
       if ($persondata->status) {
         if ($persondata->status->status == self::CPR_STATUS_DEAD) {
diff --git a/src/Plugin/os2web/DataLookup/ServiceplatformenCVR.php b/src/Plugin/os2web/DataLookup/ServiceplatformenCVR.php
index b59e762..b8ce469 100644
--- a/src/Plugin/os2web/DataLookup/ServiceplatformenCVR.php
+++ b/src/Plugin/os2web/DataLookup/ServiceplatformenCVR.php
@@ -120,7 +120,7 @@ public function lookup(string $param): CompanyLookupResult {
     $cvrResult = new CompanyLookupResult();
     if ($result['status']) {
       $cvrResult->setSuccessful();
-      $cvrResult->setCvr($param);
+      $cvrResult->setCvr($result['cvr']);
 
       $cvrResult->setName($result['company_name']);
       $cvrResult->setStreet($result['company_street']);