diff --git a/html5/verto/js/src/jquery.FSRTC.js b/html5/verto/js/src/jquery.FSRTC.js
index e9314abded..0ebb1ef21a 100644
--- a/html5/verto/js/src/jquery.FSRTC.js
+++ b/html5/verto/js/src/jquery.FSRTC.js
@@ -506,9 +506,9 @@
 	delete obj.options.videoParams.vertoBestFrameRate;
 
 	if (obj.options.screenShare) {
-	    // fix for chrome to work for now, will need to change once we figure out how to do this in a non-mandatory style constraint.
-	    if (!!navigator.mozGetUserMedia) {
-		var dowin = window.confirm("Do you want to share an application window?  If not you will share a screen.");
+	    if (!obj.options.useCamera && !!navigator.mozGetUserMedia) {
+		//This is an issue, only FireFox needs to ask this additional question if its screen or window we need a better way
+		var dowin = window.confirm("Do you want to share an application window?  If not you can share an entire screen.");
 
 		video = {
 		    width: {min: obj.options.videoParams.minWidth, max: obj.options.videoParams.maxWidth},
@@ -517,7 +517,9 @@
 		}
 	    } else {
 		var opt = [];
-		opt.push({sourceId: obj.options.useCamera});
+		if (obj.options.useCamera) {
+		    opt.push({sourceId: obj.options.useCamera});
+		}
 		
 		if (bestFrameRate) {
 		    opt.push({minFrameRate: bestFrameRate});
@@ -585,6 +587,8 @@
 	    
 	    if (screen) {
 		self.constraints.offerToReceiveVideo = false;
+		self.constraints.offerToReceiveAudio = false;
+		self.constraints.offerToSendAudio = false;
 	    }
 	    
             self.peer = FSRTCPeerConnection({
@@ -635,6 +639,7 @@
 		onsuccess: onSuccess,
 		onerror: onError
             });
+
 	} else {
 	    onSuccess(null);
 	}
diff --git a/html5/verto/js/src/jquery.verto.js b/html5/verto/js/src/jquery.verto.js
index 6e48515a92..3e47dbfff0 100644
--- a/html5/verto/js/src/jquery.verto.js
+++ b/html5/verto/js/src/jquery.verto.js
@@ -1922,7 +1922,7 @@
             useVideo: verto.options.useVideo,
             useStereo: verto.options.useStereo,
 	    screenShare: false,
-	    useCamera: verto.options.deviceParams.useCamera,
+	    useCamera: false,
 	    useMic: verto.options.deviceParams.useMic,
 	    useSpeak: verto.options.deviceParams.useSpeak,
             tag: verto.options.tag,
@@ -1931,6 +1931,11 @@
 	    videoParams: verto.options.videoParams
         }, params);
 	
+
+	if (!dialog.params.screenShare) {
+	    dialog.params.useCamera = verto.options.deviceParams.useCamera;
+	}
+
         dialog.verto = verto;
         dialog.direction = direction;
         dialog.lastState = null;