diff --git a/src/views/ContactQRScanFullView.vue b/src/views/ContactQRScanFullView.vue
index 2f389caf..e8a079cc 100644
--- a/src/views/ContactQRScanFullView.vue
+++ b/src/views/ContactQRScanFullView.vue
@@ -357,8 +357,9 @@ export default class ContactQRScan extends Vue {
       }
 
       const contactInfo = decodedJwt.payload.own;
-      if (!decodedJwt.payload.iss) {
-        logger.warn("Invalid JWT payload - missing 'iss' field");
+      const did = contactInfo.did || decodedJwt.payload.iss;
+      if (!did) {
+        logger.warn("Invalid contact info - missing DID");
         this.$notify({
           group: "alert",
           type: "danger",
@@ -370,7 +371,7 @@ export default class ContactQRScan extends Vue {
 
       // Create contact object
       const contact = {
-        did: decodedJwt.payload.iss,
+        did: did,
         name: contactInfo.name || "",
         email: contactInfo.email || "",
         phone: contactInfo.phone || "",
diff --git a/src/views/ContactQRScanShowView.vue b/src/views/ContactQRScanShowView.vue
index 61101881..6a8ecf87 100644
--- a/src/views/ContactQRScanShowView.vue
+++ b/src/views/ContactQRScanShowView.vue
@@ -483,8 +483,9 @@ export default class ContactQRScanShow extends Vue {
       }
 
       const contactInfo = decodedJwt.payload.own;
-      if (!decodedJwt.payload.iss) {
-        logger.warn("Invalid JWT payload - missing 'iss' field");
+      const did = contactInfo.did || decodedJwt.payload.iss;
+      if (!did) {
+        logger.warn("Invalid contact info - missing DID");
         this.$notify({
           group: "alert",
           type: "danger",
@@ -496,7 +497,7 @@ export default class ContactQRScanShow extends Vue {
 
       // Create contact object
       const contact = {
-        did: decodedJwt.payload.iss,
+        did: did,
         name: contactInfo.name || "",
         email: contactInfo.email || "",
         phone: contactInfo.phone || "",