diff --git a/config/logins.json b/config/logins.json
index 9ac4fb837179c8e64fafce9c84e19dc9300bd610..d16f033eeebbcbdf62c2a6d51cfe4114c0d39b65 100644
--- a/config/logins.json
+++ b/config/logins.json
@@ -142,10 +142,12 @@
         "explanation": "<b>Cappuccino</b><br/>This profile provides a R&S compatible attribute bundle with the name of the user name being provided in the 'displayname' attribute and assurance profile 'Cappuccino'",
         "display": "Cappuccino",
         "eduPersonPrincipalName": "jrockefeller@idp.example.org",
+        "subject-id": "jrockefeller",
         "displayName": "John D. Rockefeller",
         "mail": "John.D.Rockefeller@idp.example.org",
         "eduPersonAssurance": [
             "https://refeds.org/assurance",
+            "https://refeds.org/assurance/profile/cappuccino",
             "https://refeds.org/assurance/ID/unique",
             "https://refeds.org/assurance/IAP/low",
             "https://refeds.org/assurance/IAP/medium"
@@ -159,12 +161,14 @@
         "sn": "Weeler",
         "displayName": "Joseph Weeler",
         "mail": "joseph.weeler@idp.example.org",
+        "eduPersonUniqueId": "jweeler@idp.example.org",
         "eduPersonScopedAffiliation": [
           "member@idp.example.org",
           "student@idp.example.org"
         ],
         "eduPersonAssurance": [
             "https://refeds.org/assurance",
+            "https://refeds.org/assurance/profile/cappuccino",
             "https://refeds.org/assurance/ID/unique",
             "https://refeds.org/assurance/IAP/low",
             "https://refeds.org/assurance/IAP/medium",
@@ -176,10 +180,13 @@
         "display": "Espresso",
         "eduPersonPrincipalName": "bbernanke@idp.example.org",
         "eduPersonTargetedId": "29638715@idp.example.org",
+        "subject-id": "29638715",
         "displayName": "Ben Bernanke",
         "mail": "bbernanke@idp.example.org",
         "eduPersonAssurance": [
             "https://refeds.org/assurance",
+            "https://refeds.org/assurance/profile/cappuccino",
+            "https://refeds.org/assurance/profile/espresso",
             "https://refeds.org/assurance/ID/unique",
             "https://refeds.org/assurance/IAP/low",
             "https://refeds.org/assurance/IAP/medium",
@@ -192,11 +199,14 @@
         "display": "Beyond Espresso",
         "eduPersonPrincipalName": "agreenspan@idp.example.org",
         "eduPersonTargetedId": "agreenspan@idp.example.org",
+   	    "pairwise-id": "agreenspan",
         "givenName": "Alan",
         "sn": "Greenspan",
         "mail": "agreenspan6@idp.example.org",
         "eduPersonAssurance": [
             "https://refeds.org/assurance",
+            "https://refeds.org/assurance/profile/cappuccino",
+            "https://refeds.org/assurance/profile/espresso",            
             "https://refeds.org/assurance/ID/unique",
             "https://refeds.org/assurance/ID/eppn-unique-no-reassign",
             "https://refeds.org/assurance/IAP/low",
@@ -216,7 +226,6 @@
         "eduPersonAssurance": [
             "https://refeds.org/assurance",
             "https://refeds.org/assurance/ID/eppn-unique-no-reassign",           
-            "https://refeds.org/assurance/ID/unique",
             "https://refeds.org/assurance/IAP/low",
             "https://refeds.org/assurance/IAP/medium",
             "https://refeds.org/assurance/ATP/ePA-1m"
@@ -227,6 +236,7 @@
         "display": "ePPN reassign",
         "eduPersonPrincipalName": "awest@idp.example.org",
         "eduPersonTargetedID": "bd09168cf0c2e675b2def0ade6f50b7d4bb4aae",
+        "eduPersonUniqueId": "bd09168cf0c2e675b2def0ade6f50b7d4bb4aae",
         "givenName": "Anthony",
         "sn": "West",
         "displayName": "Anthony West",
@@ -250,6 +260,7 @@
         "display": "'Local Enterprise'",
         "eduPersonPrincipalName": "am_ampere@idp.example.org",
         "eduPersonTargetedId": "am_ampere@idp.example.org",
+        "subject-id": "am_ampere@idp.example.org",
         "displayName": "André-Marie Ampère",
         "mail": "am_ampere@idp.example.org",
         "eduPersonScopedAffiliation": [
@@ -273,6 +284,7 @@
         "display": "One Day Fly",
         "eduPersonPrincipalName": "w_rontgen@idp.example.org",
         "eduPersonTargetedId": "w_rontgen@idp.example.org",
+        "subject-id": "w_rontgen",
         "givenName": "Wilhelm",
         "sn": "Röntgen",
         "mail": "w_rontgen@idp.example.org",