diff --git a/bigbluebutton-client/resources/prod/lib/verto_extension.js b/bigbluebutton-client/resources/prod/lib/verto_extension.js
index d71fe71af69075a7b77128e2506eae9b42e52f20..d045baf181a391ad90725ddd07652460f1714fef 100755
--- a/bigbluebutton-client/resources/prod/lib/verto_extension.js
+++ b/bigbluebutton-client/resources/prod/lib/verto_extension.js
@@ -2,10 +2,7 @@ var callback = function(message){console.log(message);}; // holds the user's cal
 var callICEConnected = false;
 var callPurposefullyEnded = false; // used to determine whether the user ended the call or the call was ended from somewhere else outside
 var callTimeout = null; // function that will run if there is no call established
-var conferenceIdNumber = "1008"; //TODO
-var conferenceUsername = "FreeSWITCH User"; //TODO
 var toDisplayDisconnectCallback = true; // if a call is dropped only display the error the first time
-var voiceBridge = extension = "77054"; //TODO
 var wasCallSuccessful = false; // when the websocket connection is closed this determines whether a call was ever successfully established
 
 // save a copy of the hangup function registered for the verto object
diff --git a/bigbluebutton-client/resources/prod/lib/verto_extension_share.js b/bigbluebutton-client/resources/prod/lib/verto_extension_share.js
index 97f4d36d73ba4352f0e4cc07d5fa2c85dfb76f79..019ef464d8d8013c581faa424d92e27bbad06385 100755
--- a/bigbluebutton-client/resources/prod/lib/verto_extension_share.js
+++ b/bigbluebutton-client/resources/prod/lib/verto_extension_share.js
@@ -38,17 +38,20 @@ function doshare(on) {
 
 	if (sharedev !== "screen") {
 		console.log("Attempting Screen Capture with non-screen device....");
-		share_call = verto.newCall({
-			destination_number: extension + "-screen",
-			caller_id_name: conferenceUsername + " (Screen)",
-			caller_id_number: conferenceIdNumber + " (screen)",
-			outgoingBandwidth: outgoingBandwidth,
-			incomingBandwidth: incomingBandwidth,
-			useCamera: sharedev,
-			useVideo: true,
-			screenShare: true,
-			dedEnc: false,
-			mirrorInput: false
+
+		BBB.getMyUserInfo(function (retData){
+			share_call = verto.newCall({
+				destination_number: retData.voiceBridge + "-screen",
+				caller_id_name: retData.myUsername + " (Screen)",
+				caller_id_number: retData.myUserID + " (screen)",
+				outgoingBandwidth: outgoingBandwidth,
+				incomingBandwidth: incomingBandwidth,
+				useCamera: sharedev,
+				useVideo: true,
+				screenShare: true,
+				dedEnc: false,
+				mirrorInput: false
+			});
 		});
 		return;
 	}
@@ -62,17 +65,20 @@ function doshare(on) {
 			}
 
 			console.log('screen_constraints', screen_constraints);
-			share_call = verto.newCall({
-				destination_number: extension + "-screen",
-				caller_id_name: conferenceUsername + " (Screen)",
-				caller_id_number: conferenceIdNumber + " (screen)",
-				outgoingBandwidth: outgoingBandwidth,
-				incomingBandwidth: incomingBandwidth,
-				videoParams: screen_constraints.mandatory,
-				useVideo: true,
-				screenShare: true,
-				dedEnc: true,
-				mirrorInput: true
+
+			BBB.getMyUserInfo(function (retData){
+				share_call = verto.newCall({
+					destination_number: retData.voiceBridge + "-screen",
+					caller_id_name: retData.myUsername + " (Screen)",
+					caller_id_number: retData.myUserID + " (screen)",
+					outgoingBandwidth: outgoingBandwidth,
+					incomingBandwidth: incomingBandwidth,
+					videoParams: screen_constraints.mandatory,
+					useVideo: true,
+					screenShare: true,
+					dedEnc: true,
+					mirrorInput: true
+				});
 			});
 		});
 	});