diff --git a/web-service/server/src/index.js b/web-service/server/src/index.js
index 3e3ac2e247d1e737361eab27ad76bfe19d75e3a0..8f8b1c9d8cd175c4043058f3c396e731457aa5ec 100644
--- a/web-service/server/src/index.js
+++ b/web-service/server/src/index.js
@@ -403,8 +403,8 @@ app.ws('/', (ws, req) => {
 	});
 
 	p.bind("node_details", () => {
-		console.log(peer.convertUUID())
-		return [`{"title": "FTL Web-Service", "id": "${peer.convertUUID}", "kind": "master"}`];
+		console.log(p.convertUUID())
+		return [`{"title": "FTL Web-Service", "id": "${p.convertUUID()}", "kind": "master"}`];
 	});
 
 	p.bind("list_streams", () => {
diff --git a/web-service/server/src/peer.js b/web-service/server/src/peer.js
index a0ecc5fa076d82c54301f4355dd110212fb979b4..957bdd352512e3e3657ca9f8d18593c11390a4ab 100644
--- a/web-service/server/src/peer.js
+++ b/web-service/server/src/peer.js
@@ -9,8 +9,10 @@ const kConnected = 2;
 const kDisconnected = 3;
 
 // Generate a unique id for this webservice
+let cpp_my_uuid = uuidv4();
+console.log(cpp_my_uuid)
 let my_uuid = uuidParser.parse(uuidv4())
-my_uuid = new Uint8Array(my_uuid);
+my_uuid = new Uint8Array(cpp_my_uuid);
 // my_uuid[0] = 44;
 my_uuid = Buffer.from(my_uuid);
 
@@ -273,40 +275,44 @@ Peer.prototype.on = function(evt, f) {
  * Returns a string of the UUID
  */
 Peer.prototype.convertUUID = function() {
-	const digits = "0123456789abcdef";
-	const uuid = my_uuid
+	const uuid = cpp_my_uuid
 	console.log("MY_UUID", uuid)
+
+	const digits = "0123456789abcdef";
+	let rc = "";
 	let j=0;
 		for (let i=0; i<4; ++i) {
-			rc[j+1] = digits[uuid[i] & 0x0f];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			console.log(digits[digits.indexOf(uuid[i])]);
+			rc[j] = digits[digits.indexOf(uuid[i+1])];
+			console.log(digits[digits.indexOf(uuid[i+1])]);
 			j+=2;
 		}
 		rc[j++] = '-';
 		for (let i=4 ; i<6; ++i) {
-			rc[j+1] = digits[uuid[i]];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			rc[j] = digits[digits.indexOf(uuid[i])];
 			j+=2;
 		}
 		rc[j++] = '-';
 		for (let i=6 ; i<8; ++i) {
-			rc[j+1] = digits[uuid[i] & 0x0f];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			rc[j] = digits[digits.indexOf(uuid[i])];
 			j+=2;
 		}
 		rc[j++] = '-';
 		for (let i=8 ; i<10; ++i) {
-			rc[j+1] = digits[uuid[i] & 0x0f];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			rc[j] = digits[digits.indexOf(uuid[i])];
 			j+=2;
 		}
 		rc[j++] = '-';
 		for (let i=10 ; i<16; ++i) {
-			rc[j+1] = digits[uuid[i] & 0x0f];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			rc[j] = digits[digits.indexOf(uuid[i])];
 			j+=2;
 		}
-		console.log(rc)
+		console.log("RC", rc)
 	return rc;
 }
 
diff --git a/web-service/server/src/public/js/bundle.js b/web-service/server/src/public/js/bundle.js
index 6df36aecf6fdd352610f0879daf58c73e8ed463a..1bc7a6ddecda8c4870751572fc568e1fc0dbe9e7 100644
--- a/web-service/server/src/public/js/bundle.js
+++ b/web-service/server/src/public/js/bundle.js
@@ -4349,8 +4349,10 @@ const kConnected = 2;
 const kDisconnected = 3;
 
 // Generate a unique id for this webservice
+let cpp_my_uuid = uuidv4();
+console.log(cpp_my_uuid)
 let my_uuid = uuidParser.parse(uuidv4())
-my_uuid = new Uint8Array(my_uuid);
+my_uuid = new Uint8Array(cpp_my_uuid);
 // my_uuid[0] = 44;
 my_uuid = Buffer.from(my_uuid);
 
@@ -4613,40 +4615,44 @@ Peer.prototype.on = function(evt, f) {
  * Returns a string of the UUID
  */
 Peer.prototype.convertUUID = function() {
-	const digits = "0123456789abcdef";
-	const uuid = my_uuid
+	const uuid = cpp_my_uuid
 	console.log("MY_UUID", uuid)
+
+	const digits = "0123456789abcdef";
+	let rc = "";
 	let j=0;
 		for (let i=0; i<4; ++i) {
-			rc[j+1] = digits[uuid[i] & 0x0f];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			console.log(digits[digits.indexOf(uuid[i])]);
+			rc[j] = digits[digits.indexOf(uuid[i+1])];
+			console.log(digits[digits.indexOf(uuid[i+1])]);
 			j+=2;
 		}
 		rc[j++] = '-';
 		for (let i=4 ; i<6; ++i) {
-			rc[j+1] = digits[uuid[i]];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			rc[j] = digits[digits.indexOf(uuid[i])];
 			j+=2;
 		}
 		rc[j++] = '-';
 		for (let i=6 ; i<8; ++i) {
-			rc[j+1] = digits[uuid[i] & 0x0f];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			rc[j] = digits[digits.indexOf(uuid[i])];
 			j+=2;
 		}
 		rc[j++] = '-';
 		for (let i=8 ; i<10; ++i) {
-			rc[j+1] = digits[uuid[i] & 0x0f];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			rc[j] = digits[digits.indexOf(uuid[i])];
 			j+=2;
 		}
 		rc[j++] = '-';
 		for (let i=10 ; i<16; ++i) {
-			rc[j+1] = digits[uuid[i] & 0x0f];
-			rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+			rc[j+1] = digits[digits.indexOf(uuid[i])];
+			rc[j] = digits[digits.indexOf(uuid[i])];
 			j+=2;
 		}
-		console.log(rc)
+		console.log("RC", rc)
 	return rc;
 }