diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index cf62bf4b9dcc0be361911a1c03f7aad5c417c0c1..aca2eb9ebeff17653fd1dd45afd1d0368b9d0d7c 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -334,8 +334,15 @@ function getCertificateForPassport(passportUUID, internal) {
       }
     }
 
-    var passportIdentity = new Identity();
-    passportIdentity.set(window.currentlyAuthenticatedIdentity);
+    let passportIdentity;
+
+    if (window.currentlyAuthenticatedIdentity instanceof Identity) {
+      passportIdentity = window.currentlyAuthenticatedIdentity;
+    } else {
+      passportIdentity = new Identity();
+      passportIdentity.set(window.currentlyAuthenticatedIdentity);
+    }
+
     var passport = passportIdentity.getPassport(passportUUID);
     if(passport === undefined || passport === null) {
       createPassportCertificate(passportUUID).then(function(keys){