diff --git a/src/BusProNet/Model/PersonalData.php b/src/BusProNet/Model/PersonalData.php
index 4135977..2e85da5 100644
--- a/src/BusProNet/Model/PersonalData.php
+++ b/src/BusProNet/Model/PersonalData.php
@@ -137,7 +137,8 @@ class PersonalData
     public function getClaims(): array
     {
         return [
-            'id' => $this->personId,
+            'person_id' => $this->personId,
+            'address_id' => $this->addressId,
             'email' => $this->communication->email,
             'roles' => $this->roles,
             'profile' => [
diff --git a/src/Controller/Api/UserinfoController.php b/src/Controller/Api/UserinfoController.php
index 1e83a07..e4a906e 100644
--- a/src/Controller/Api/UserinfoController.php
+++ b/src/Controller/Api/UserinfoController.php
@@ -30,7 +30,8 @@ class UserinfoController extends AbstractController
 
         // extend scopes depending on granted permissions
         if ($this->isGranted('ROLE_OAUTH2_ID')) {
-            $scopes[] = 'id';
+            $scopes[] = 'person_id';
+            $scopes[] = 'address_id';
         }
         if ($this->isGranted('ROLE_OAUTH2_PROFILE')) {
             $scopes[] = 'profile';