diff --git a/asset-transfer-ledger-queries/application-javascript/app.js b/asset-transfer-ledger-queries/application-javascript/app.js
index ef9bb653..75fe3045 100644
--- a/asset-transfer-ledger-queries/application-javascript/app.js
+++ b/asset-transfer-ledger-queries/application-javascript/app.js
@@ -6,14 +6,16 @@
 
 'use strict';
 
-const {Gateway, Wallets} = require('fabric-network');
+const { Gateway, Wallets } = require('fabric-network');
 const FabricCAServices = require('fabric-ca-client');
 const path = require('path');
-const {buildCAClient, registerAndEnrollUser, enrollAdmin} = require('../../test-application/javascript/CAUtil.js');
-const {buildCCP, buildWallet} = require('../../test-application/javascript/AppUtil.js');
+const { buildCAClient, registerAndEnrollUser, enrollAdmin } = require('../../test-application/javascript/CAUtil.js');
+const { buildCCPOrg1, buildWallet } = require('../../test-application/javascript/AppUtil.js');
 
 const channelName = 'mychannel';
 const chaincodeName = 'ledger';
+const mspOrg1 = 'Org1MSP';
+
 const walletPath = path.join(__dirname, 'wallet');
 const userId = 'appUser';
 
@@ -78,21 +80,21 @@ async function main() {
 
 	try {
 		// build an in memory object with the network configuration (also known as a connection profile)
-		const ccp = buildCCP();
+		const ccp = buildCCPOrg1();
 
 		// build an instance of the fabric ca services client based on
 		// the information in the network configuration
-		const caClient = buildCAClient(FabricCAServices, ccp);
+		const caClient = buildCAClient(FabricCAServices, ccp, 'ca.org1.example.com');
 
 		// setup the wallet to hold the credentials of the application user
 		const wallet = await buildWallet(Wallets, walletPath);
 
 		// in a real application this would be done on an administrative flow, and only once
-		await enrollAdmin(caClient, wallet);
+		await enrollAdmin(caClient, wallet, mspOrg1);
 
 		// in a real application this would be done only when a new user was required to be added
 		// and would be part of an administrative flow
-		await registerAndEnrollUser(caClient, wallet, userId, 'org1.department1');
+		await registerAndEnrollUser(caClient, wallet, mspOrg1, userId, 'org1.department1');
 
 		// Create a new gateway instance for interacting with the fabric network.
 		// In a real application this would be done as the backend server session is setup for
@@ -107,7 +109,7 @@ async function main() {
 			await gateway.connect(ccp, {
 				wallet,
 				identity: userId,
-				discovery: {enabled: true, asLocalhost: true} // using asLocalhost as this gateway is using a fabric network deployed locally
+				discovery: { enabled: true, asLocalhost: true } // using asLocalhost as this gateway is using a fabric network deployed locally
 			});
 
 			// Build a network instance based on the channel where the smart contract is deployed
@@ -125,7 +127,7 @@ async function main() {
 					console.log('\n--> Submit Transaction: InitLedger, function creates the initial set of assets on the ledger');
 					await contract.submitTransaction('InitLedger');
 					console.log('*** Result: committed');
-				} catch(initError) {
+				} catch (initError) {
 					// this is error is OK if we are rerunning this app without restarting
 					console.log(`******** initLedger failed :: ${initError}`)
 				}
@@ -189,7 +191,7 @@ async function main() {
 
 			// Rich Query with Pagination (Only supported if CouchDB is used as state database)
 			console.log('\n--> Evaluate Transaction: QueryAssetsWithPagination, function returns "Tom" assets');
-			result = await contract.evaluateTransaction('QueryAssetsWithPagination', '{"selector":{"docType":"asset","owner":"Tom"}, "use_index":["_design/indexOwnerDoc", "indexOwner"]}','3','');
+			result = await contract.evaluateTransaction('QueryAssetsWithPagination', '{"selector":{"docType":"asset","owner":"Tom"}, "use_index":["_design/indexOwnerDoc", "indexOwner"]}', '3', '');
 			console.log(`*** Result: ${prettyJSONString(result.toString())}`);
 
 			console.log('\n--> Submit Transaction: TransferAssetByColor, transfer all yellow assets to new owner(Michel)');
diff --git a/asset-transfer-private-data/application-javascript/app.js b/asset-transfer-private-data/application-javascript/app.js
index 467fbe0d..edac6185 100644
--- a/asset-transfer-private-data/application-javascript/app.js
+++ b/asset-transfer-private-data/application-javascript/app.js
@@ -9,7 +9,7 @@
 const { Gateway, Wallets } = require('fabric-network');
 const FabricCAServices = require('fabric-ca-client');
 const path = require('path');
-const { buildCAClient, registerUser, enrollAdmin } = require('../../test-application/javascript/CAUtil.js');
+const { buildCAClient, registerAndEnrollUser, enrollAdmin } = require('../../test-application/javascript/CAUtil.js');
 const { buildCCPOrg1, buildCCPOrg2, buildWallet } = require('../../test-application/javascript/AppUtil.js');
 
 const myChannel = 'mychannel';
@@ -52,7 +52,7 @@ async function initContractFromOrg1Identity() {
     // and stores app user identity in local wallet
     // In a real application this would be done only when a new user was required to be added
     // and would be part of an administrative flow
-    await registerUser(caOrg1Client, walletOrg1, mspOrg1, Org1UserId, 'org1.department1');
+    await registerAndEnrollUser(caOrg1Client, walletOrg1, mspOrg1, Org1UserId, 'org1.department1');
 
     try {
         // Create a new gateway for connecting to Org's peer node.
@@ -77,7 +77,7 @@ async function initContractFromOrg2Identity() {
     const walletOrg2 = await buildWallet(Wallets, walletPathOrg2);
 
     await enrollAdmin(caOrg2Client, walletOrg2, mspOrg2);
-    await registerUser(caOrg2Client, walletOrg2, mspOrg2, Org2UserId, 'org2.department1');
+    await registerAndEnrollUser(caOrg2Client, walletOrg2, mspOrg2, Org2UserId, 'org2.department1');
 
     try {
         // Create a new gateway for connecting to Org's peer node.