diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index b3eef997007a4f0435a786508f1a2f0edb3e2628..3a2641b038313a478f1ea5a2ae94d43d6143b5c6 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -74,7 +74,7 @@
 			showButton="true"
 			publishWindowVisible="true"
 			viewerWindowMaxed="true"
-			viewerWindowLocation="middle"
+			viewerWindowLocation="top"
 			camKeyFrameInterval="5"
 			camModeFps="15"
 			camQualityBandwidth="0"
diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
index 1a28412afefe4de9d00eb389f98d2d6c34c7b474..81473a79875bac15606c30eba57364ba27433e05 100755
--- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
+++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -129,7 +129,8 @@ class ApiController {
       if (existing.getViewerPassword().equals(params.get("attendeePW")) && existing.getModeratorPassword().equals(params.get("moderatorPW"))) {
         paramsProcessorUtil.updateMeeting(updateParams, existing);
         // trying to create a conference a second time, return success, but give extra info
-        uploadDocuments(existing);
+        // Ignore pre-uploaded presentations. We only allow uploading of presentation once.
+        //uploadDocuments(existing);
         respondWithConference(existing, "duplicateWarning", "This conference was already in existence and may currently be in progress.");
       } else {
 	  	// BEGIN - backward compatibility