diff --git a/pb/Gemfile.lock b/pb/Gemfile.lock
index 2c1f6f007..7423034c8 100644
--- a/pb/Gemfile.lock
+++ b/pb/Gemfile.lock
@@ -13,4 +13,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.17.3
+   2.3.17
diff --git a/web/Gemfile.lock b/web/Gemfile.lock
index 1a150ba57..35befb7fa 100644
--- a/web/Gemfile.lock
+++ b/web/Gemfile.lock
@@ -554,6 +554,8 @@ GEM
     rabl (0.13.1)
       activesupport (>= 2.3.14)
     rack (1.6.13)
+    rack-cors (1.0.6)
+      rack (>= 1.6.0)
     rack-oauth2 (1.12.0)
       activesupport
       attr_required
@@ -873,6 +875,7 @@ DEPENDENCIES
   puma
   quiet_assets
   rabl (= 0.13.1)
+  rack-cors (~> 1.0, >= 1.0.6)
   rack-test
   rails (= 4.2.8)
   rails-assets-bluebird!
diff --git a/web/app/assets/javascripts/asyncJamClient.js b/web/app/assets/javascripts/asyncJamClient.js
index bee5e33ae..ebcf50e5e 100644
--- a/web/app/assets/javascripts/asyncJamClient.js
+++ b/web/app/assets/javascripts/asyncJamClient.js
@@ -30,6 +30,7 @@
       BringVideoWindowToFront: enumAppCounter++,
       browseForUserBackingTracksCandidate: enumAppCounter++,
       cancelVideoUpload: enumAppCounter++,
+      clientID: enumAppCounter++,
       ClientJoinedSession: enumAppCounter++,
       ClientLeftSession: enumAppCounter++,
       ClientUpdateStartDownload: enumAppCounter++,
@@ -142,7 +143,6 @@
       GetASIODevices: enumAppCounter++,
       GetAutoStart: enumAppCounter++,
       getAvailableMetronomeClickNames: enumAppCounter++,
-      getClientId: enumAppCounter++,
       getBackingTrackList: enumAppCounter++,
       getClientParentChildRole: enumAppCounter++,
       getConnectionDetail: enumAppCounter++,