diff --git a/types/openpgp/index.d.ts b/types/openpgp/index.d.ts
index a83c75b050..0dd76c2577 100644
--- a/types/openpgp/index.d.ts
+++ b/types/openpgp/index.d.ts
@@ -1565,6 +1565,8 @@ export namespace key {
          */
         constructor(packetlist: packet.List);
 
+        primaryKey: Key;
+
         /**
          * Transforms packetlist to structured key data
          * @param packetlist The packets that form a key
@@ -4736,8 +4738,8 @@ export function getWorker(): worker.async_proxy.AsyncProxy | null;
 export function destroyWorker(): void;
 
 export interface UserID {
-    name: string;
-    email: string;
+    name?: string;
+    email?: string;
 }
 
 export interface KeyOptions {
diff --git a/types/openpgp/openpgp-tests.ts b/types/openpgp/openpgp-tests.ts
index c72d77f2fc..f4039e4c71 100644
--- a/types/openpgp/openpgp-tests.ts
+++ b/types/openpgp/openpgp-tests.ts
@@ -7,6 +7,11 @@ const options: openpgp.KeyOptions = {
     userIds: [{
         name: 'Jon Smith',
         email: 'jon.smith@example.org',
+    }, {
+        email: 'jon.smith@example.org',
+    }, {
+        name: 'Jon Smith',
+    }, {
     }],
     passphrase: 'super long and hard to guess secret'
 };
@@ -156,7 +161,7 @@ openpgp.initWorker({
         armor: false,
         detached: false,
     }).then(s => s.message/* as openpgp.message.Message*/);
-    
+
     const verifyOptions: openpgp.VerifyOptions = {
         message,
         signature,
@@ -168,6 +173,12 @@ openpgp.initWorker({
     return verified.signatures[0].valid;
 })();
 
+(async () => {
+    const publicKey = (await openpgp.key.readArmored(spubkey));
+
+    return publicKey.keys[0].primaryKey.getFingerprint()/* as string*/
+})
+
 // Open PGP Tests
 
 const keyoptions: openpgp.KeyOptions = null;
diff --git a/types/openpgp/ts3.2/index.d.ts b/types/openpgp/ts3.2/index.d.ts
index 86862ce0ca..c3bc5bfa51 100644
--- a/types/openpgp/ts3.2/index.d.ts
+++ b/types/openpgp/ts3.2/index.d.ts
@@ -1634,6 +1634,8 @@ export namespace key {
          */
         constructor(packetlist: packet.List);
 
+        primaryKey: Key;
+
         /**
          * Transforms packetlist to structured key data
          * @param packetlist The packets that form a key
@@ -4807,8 +4809,8 @@ export function getWorker(): worker.async_proxy.AsyncProxy | null;
 export function destroyWorker(): void;
 
 export interface UserID {
-    name: string;
-    email: string;
+    name?: string;
+    email?: string;
 }
 
 export interface KeyOptions {
diff --git a/types/openpgp/ts3.2/openpgp-tests.ts b/types/openpgp/ts3.2/openpgp-tests.ts
index e35e79f1a0..9f713da365 100644
--- a/types/openpgp/ts3.2/openpgp-tests.ts
+++ b/types/openpgp/ts3.2/openpgp-tests.ts
@@ -7,6 +7,11 @@ var options: openpgp.KeyOptions = {
     userIds: [{
         name: 'Jon Smith',
         email: 'jon.smith@example.org',
+    }, {
+        email: 'jon.smith@example.org',
+    }, {
+        name: 'Jon Smith',
+    }, {
     }],
     passphrase: 'super long and hard to guess secret'
 };
@@ -171,6 +176,12 @@ openpgp.initWorker({
     return verified.signatures[0].valid;
 })();
 
+(async () => {
+    const publicKey = (await openpgp.key.readArmored(spubkey));
+
+    return publicKey.keys[0].primaryKey.getFingerprint()/* as string*/
+})
+
 // Open PGP Tests