diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 2ede60c5e..674478588 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -39239,7 +39239,7 @@ window.textsecure.api = function () {
         keys.preKeys = [];
         var j = 0;
         for (var i in genKeys.preKeys)
-            keys.preKeys[j++] = {keyId: i, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))};
+            keys.preKeys[j++] = {keyId: genKeys.preKeys[i].keyId, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))};
 
         //TODO: This is just to make the server happy (v2 clients should choke on publicKey),
         // it needs removed before release
diff --git a/libtextsecure/api.js b/libtextsecure/api.js
index b44a2a42b..18ff212f9 100644
--- a/libtextsecure/api.js
+++ b/libtextsecure/api.js
@@ -194,7 +194,7 @@ window.textsecure.api = function () {
         keys.preKeys = [];
         var j = 0;
         for (var i in genKeys.preKeys)
-            keys.preKeys[j++] = {keyId: i, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))};
+            keys.preKeys[j++] = {keyId: genKeys.preKeys[i].keyId, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))};
 
         //TODO: This is just to make the server happy (v2 clients should choke on publicKey),
         // it needs removed before release