diff --git a/src/webui/html/upload.html b/src/webui/html/upload.html
index 2140f181f..f00f48bfc 100644
--- a/src/webui/html/upload.html
+++ b/src/webui/html/upload.html
@@ -7,31 +7,30 @@
 	<script type="text/javascript" src="scripts/mootools-1.2-core-yc.js" charset="utf-8"></script>
 <script type="text/javascript">
 
-function hideAll() {
-  window.parent.closeWindows();
+function stateChangeHandler() {
+	if (this.readyState == this.DONE) {
+		if (this.status == 200)
+			window.parent.closeWindows();
+		else
+			alert("Upload Failed!");
+	}
 }
 
 function uploadFiles(files) {
 	var xhr = new XMLHttpRequest();
 	if (xhr.upload) {
-		// file received/failed
-		xhr.onreadystatechange = function(e) {
-			if (xhr.readyState == 4) {
-				if (xhr.status == 200)
-					hideAll();
-				else
-					alert("Upload Failed!");
-			}
-		};
 		// start upload
 		var formData = new FormData();
-		for (var i = 0, file; file = files[i]; ++i) {
-    	formData.append(file.name, file);
-    }
-		xhr.open("POST", "command/upload", true);
+		for (var i = 0, file; file = files[i]; ++i)
+			formData.append(file.name, file);
+		xhr.onreadystatechange = stateChangeHandler;
+		xhr.open("POST", "command/upload");
+		// Bypass cache
+		xhr.setRequestHeader("Cache-Control", "no-cache");
 		xhr.send(formData);
 	}
 }
+
 // file selection
 function fileSelectHandler(e) {
 	// fetch FileList object
@@ -44,9 +43,8 @@ window.addEvent('load', function() {
   $('fileselect').addEvent('change', fileSelectHandler);
   // is XHR2 available?
 	var xhr = new XMLHttpRequest();
-	if (xhr.upload) {
+	if (xhr.upload)
 		$('submitbutton').addClass("invisible");
-	}
 });
 </script>
 </head>
diff --git a/src/webui/httpconnection.cpp b/src/webui/httpconnection.cpp
index 308b1cc0b..7f7afd7c9 100644
--- a/src/webui/httpconnection.cpp
+++ b/src/webui/httpconnection.cpp
@@ -285,7 +285,7 @@ void HttpConnection::respond() {
   }
 
   // Icons from theme
-  qDebug() << "list[0]" << list[0];
+  //qDebug() << "list[0]" << list[0];
   if (list[0] == "theme" && list.size() == 2) {
 #ifdef DISABLE_GUI
     url = ":/Icons/oxygen/"+list[1]+".png";
@@ -381,6 +381,7 @@ void HttpConnection::respondGlobalTransferInfoJson() {
 }
 
 void HttpConnection::respondCommand(const QString& command) {
+  qDebug() << Q_FUNC_INFO << command;
   if (command == "download") {
     QString urls = m_parser.post("urls");
     QStringList list = urls.split('\n');
@@ -422,7 +423,7 @@ void HttpConnection::respondCommand(const QString& command) {
     const QList<QByteArray>& torrents = m_parser.torrents();
     foreach(const QByteArray& torrentContent, torrents) {
       // Get a unique filename
-      QTemporaryFile *tmpfile = new QTemporaryFile (QDir::temp().absoluteFilePath("qBT-XXXXXX.torrent"));
+      QTemporaryFile *tmpfile = new QTemporaryFile(QDir::temp().absoluteFilePath("qBT-XXXXXX.torrent"));
       tmpfile->setAutoRemove(false);
       if (tmpfile->open()) {
         QString filePath = tmpfile->fileName();