diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index eef840444c7b71103748127ca45fd2ed93efc13c..fd12aae2f911c64693e5c36a014089ef72fea68b 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -168,6 +168,7 @@ bbb.listenerItem.talkImg.toolTip = Talking
 bbb.listenerItem.lockImg.toolTip = Click to keep muted or unmuted
 bbb.listenerItem.muteUnmute.toolTip = Mute or unmute this listener
 bbb.publishVideo.title = Share your webcam
+bbb.publishVideo.changeCamera.toolTip = Click to open the change camera dialog box
 bbb.publishVideo.startPublishBtn.toolTip = Start Sharing
 bbb.video.minimizeBtn.accessibilityName = Minimize the Video Dock Window
 bbb.video.maximizeRestoreBtn.accessibilityName = Maximize the Video Dock Window
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
index fcd6e1536081f272050a569ed7d2e7ca1dc98272..3dc36c566b57d3991f42586f3e43b7e75a04372d 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
@@ -129,7 +129,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			displayVideoPreview();
 		}
 		
-		private function displayVideoPreview():void {       
+		private function displayVideoPreview():void {
+			setComboResolution();		
+		
 			var videoOptions:VideoConfOptions = new VideoConfOptions();
 			_camera.setMotionLevel(5, 1000);
 			_camera.setKeyFrameInterval(videoOptions.camKeyFrameInterval);
@@ -141,8 +143,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				setResolution(_camera.width, _camera.height);
 			}
 			
-			setComboResolution();
-			
 			if (_video != null) {
 				_videoHolder.remove(_video);
 			}
@@ -150,7 +150,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			_video = new Video();       
 			_video.attachCamera(_camera);
 			
-			aspectRatio = (_video.width / _video.height);
+			//aspectRatio = (_video.width / _video.height);
 			
 			if (aspectRatio > _videoHolder.width / _videoHolder.height) {
 				_video.width = _videoHolder.width;
@@ -288,7 +288,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			<mx:Spacer width="5"/>
 			<mx:Button id="changeCamera" styleName="cameraDisplaySettingsWindowChangeCamBtn" 
 					   label="{ResourceUtil.getInstance().getString('bbb.publishVideo.changeCameraBtn.labelText')}" 
-					   toolTip="{ResourceUtil.getInstance().getString('bbb.publishVideo.startPublishBtn.toolTip')}" 
+					   toolTip="{ResourceUtil.getInstance().getString('bbb.publishVideo.changeCamera.toolTip')}" 
 					   click="showCameraSettings()"/>
 			<mx:Spacer width="70%"/>
 			<mx:ComboBox id="cmbResolution" styleName="cameraDisplaySettingsWindowChangeResolutionCombo"